diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
index 94995c078..aa2e9a0e5 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
@@ -517,10 +517,10 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t
 
 	public void generateDemandInBulk(CalculationReq calculationReq, String billingCycle, Map<String, Object> masterMap,
 									 boolean isSendMessage,String tenantId) {
-		log.info("masterMap:"+masterMap);
+		Map<String, Object> masterMapDemand =  (Map<String, Object>) masterMap;
 		try {
 			if(!tenantId.equals(config.getSmsExcludeTenant())) {
-				generateDemandInBatch(calculationReq, masterMap, billingCycle, isSendMessage);
+				generateDemandInBatch(calculationReq, masterMapDemand, billingCycle, isSendMessage);
 			}
 
 		} catch (Exception e) {
diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
index 37d57d946..f154930b9 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
@@ -80,7 +80,7 @@ public Map<String, List> getEstimationMap(CalculationCriteria criteria, RequestI
 		ArrayList<String> billingSlabIds = new ArrayList<>();
 		log.info("masterData.get(WSCalculationConstant.WC_BILLING_SLAB_MASTER):"+masterData.get(WSCalculationConstant.WC_BILLING_SLAB_MASTER));
 		log.info("masterData.get(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST)" +masterData.get(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST));
-		// Convert and assign WC_BILLING_SLAB_MASTER
+		/*// Convert and assign WC_BILLING_SLAB_MASTER
 		ArrayList<String> wcBillingSlabList = (ArrayList<String>) masterData.get(WSCalculationConstant.WC_BILLING_SLAB_MASTER);
 		JSONArray wcBillingSlabArray = new JSONArray();
 		wcBillingSlabArray.addAll(wcBillingSlabList);
@@ -89,12 +89,12 @@ public Map<String, List> getEstimationMap(CalculationCriteria criteria, RequestI
 		ArrayList<String> calculationAttributeList = (ArrayList<String>) masterData.get(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST);
 		JSONArray calculationAttributeArray = new JSONArray();
 		calculationAttributeArray.addAll(calculationAttributeList);
-		billingSlabMaster.put(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST, calculationAttributeArray);
+		billingSlabMaster.put(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST, calculationAttributeArray);*/
 
-		/*billingSlabMaster.put(WSCalculationConstant.WC_BILLING_SLAB_MASTER,
+		billingSlabMaster.put(WSCalculationConstant.WC_BILLING_SLAB_MASTER,
 				(JSONArray) masterData.get(WSCalculationConstant.WC_BILLING_SLAB_MASTER));
 		billingSlabMaster.put(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST,
-				(JSONArray) masterData.get(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST));*/
+				(JSONArray) masterData.get(WSCalculationConstant.CALCULATION_ATTRIBUTE_CONST));
 //		timeBasedExemptionMasterMap.put(WSCalculationConstant.WC_WATER_CESS_MASTER,
 //				(JSONArray) (masterData.getOrDefault(WSCalculationConstant.WC_WATER_CESS_MASTER, null)));
 		// mDataService.setWaterConnectionMasterValues(requestInfo, tenantId,