diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
index 72fd6d074..d859603f1 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/data/WorkingDaysData.java
@@ -24,18 +24,14 @@ import java.util.Collection;
 
 public class WorkingDaysData {
 
-    @SuppressWarnings("unused")
     private final Long id;
-    @SuppressWarnings("unused")
+    
     private final String recurrence;
 
-    @SuppressWarnings("unused")
     private final EnumOptionData repaymentRescheduleType;
 
-    @SuppressWarnings("unused")
     private final Boolean extendTermForDailyRepayments;
 
-    @SuppressWarnings("unused")
     private final Boolean extendTermForRepaymentsOnHolidays;
 
     // template date
@@ -60,4 +56,13 @@ public class WorkingDaysData {
         this.extendTermForDailyRepayments = extendTermForDailyRepayments;
         this.extendTermForRepaymentsOnHolidays = extendTermForRepaymentsOnHolidays;
     }
+    
+    public WorkingDaysData(WorkingDaysData data, Collection<EnumOptionData> repaymentRescheduleOptions) {
+        this.id = data.id;
+        this.recurrence = data.recurrence;
+        this.repaymentRescheduleType = data.repaymentRescheduleType;
+        this.repaymentRescheduleOptions = repaymentRescheduleOptions;
+        this.extendTermForDailyRepayments = data.extendTermForDailyRepayments;
+        this.extendTermForRepaymentsOnHolidays = data.extendTermForRepaymentsOnHolidays;
+    }
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
index 8c4153cd5..e5085e091 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysReadPlatformServiceImpl.java
@@ -79,10 +79,13 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
 
     @Override
     public WorkingDaysData retrieve() {
+    	//Check whether template is enabled or not?
         try {
             final WorkingDaysMapper rm = new WorkingDaysMapper();
             final String sql = " select " + rm.schema();
-            return this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
+            WorkingDaysData data = this.jdbcTemplate.queryForObject(sql, rm, new Object[] {});
+            Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions() ;
+            return new WorkingDaysData(data, repaymentRescheduleOptions) ;
         } catch (final EmptyResultDataAccessException e) {
             throw new WorkingDaysNotFoundException();
         }
@@ -90,11 +93,15 @@ public class WorkingDaysReadPlatformServiceImpl implements WorkingDaysReadPlatfo
 
     @Override
     public WorkingDaysData repaymentRescheduleType() {
-        Collection<EnumOptionData> repaymentRescheduleOptions = Arrays.asList(
-                WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
-                WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
-                WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
-                WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
+        Collection<EnumOptionData> repaymentRescheduleOptions = repaymentRescheduleTypeOptions();
         return new WorkingDaysData(null, null, null, repaymentRescheduleOptions, null, null);
     }
+    
+    private Collection<EnumOptionData> repaymentRescheduleTypeOptions() {
+    	 return Arrays.asList(
+                 WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.SAME_DAY),
+                 WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_WORKING_DAY),
+                 WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_NEXT_REPAYMENT_MEETING_DAY),
+                 WorkingDaysEnumerations.repaymentRescheduleType(RepaymentRescheduleType.MOVE_TO_PREVIOUS_WORKING_DAY));
+    }
 }