diff --git a/data/pb/BillingService/TaxPeriod.json b/data/pb/BillingService/TaxPeriod.json
index 8505c7341d..e0a0cecc2c 100644
--- a/data/pb/BillingService/TaxPeriod.json
+++ b/data/pb/BillingService/TaxPeriod.json
@@ -88,35 +88,35 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.ELECTRICITY_BILL",
       "code": "EXPENSEELECTRICITY_BILL",
       "financialYear": "2022-23"
     },{
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.SALARY",
       "code": "EXPENSESALARY",
       "financialYear": "2022-23"
     },{
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.MACHINERY_REPAIR",
       "code": "EXPENSEMACHINERYREPAIR",
       "financialYear": "2022-23"
     },{
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.OTHERS",
       "code": "EXPENSEOTHERS",
       "financialYear": "2022-23"
     },{
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "WS",
       "code": "WC2022",
@@ -124,7 +124,7 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.CHLORINATION",
       "code": "EXPENSECHLORINATION",
@@ -132,7 +132,7 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.WATER_TREATMENT",
       "code": "EXPENSEWATERTREATMENT",
@@ -140,7 +140,7 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.PIPELINE_REPAIR",
       "code": "EXPENSEPIPELINEREPAIR",
@@ -148,7 +148,7 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.NEW_MACHINERY",
       "code": "EXPENSENEWMACHINERY",
@@ -156,7 +156,7 @@
     },
     {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.NEW_PIPELINE",
       "code": "EXPENSENEWPIPELINE",
@@ -164,96 +164,96 @@
     },
      {
       "fromDate": 1648751400000,
-      "toDate": 1680244199000,
+      "toDate": 1680244199999,
       "periodCycle": "TWOYEARS",
       "service": "EXPENSE.INCENTIVES",
       "code": "EXPENSEINCENTIVES",
       "financialYear": "2022-23"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.ELECTRICITY_BILL",
       "code": "EXPENSEELECTRICITY_BILL",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.SALARY",
       "code": "EXPENSESALARY",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.MACHINERY_REPAIR",
       "code": "EXPENSEMACHINERYREPAIR",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
       "periodCycle": "ANNUAL",
       "service": "EXPENSE.OTHERS",
       "code": "EXPENSEOTHERS",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "WS",
       "code": "WC2023",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.CHLORINATION",
       "code": "EXPENSECHLORINATION",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.WATER_TREATMENT",
       "code": "EXPENSEWATERTREATMENT",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.PIPELINE_REPAIR",
       "code": "EXPENSEPIPELINEREPAIR",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.NEW_MACHINERY",
       "code": "EXPENSENEWMACHINERY",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.NEW_PIPELINE",
       "code": "EXPENSENEWPIPELINE",
       "financialYear": "2023-24"
     },
     {
-      "fromDate": 1680244199000,
-      "toDate": 1711866599000,
-      "periodCycle": "TWOYEARS",
+      "fromDate": 1680287400000,
+      "toDate": 1711866599999,
+      "periodCycle": "ANNUAL",
       "service": "EXPENSE.INCENTIVES",
       "code": "EXPENSEINCENTIVES",
       "financialYear": "2023-24"