Index: NVDataMgmt.c
===================================================================
diff -u -rff5e595afd7ad79dd7693dfa598b24fdeacad95d -rd4aea540d447203cfd9aca91281d1dc9e9e9bc1d
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision ff5e595afd7ad79dd7693dfa598b24fdeacad95d)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d4aea540d447203cfd9aca91281d1dc9e9e9bc1d)
@@ -23,7 +23,6 @@
 #include "system.h"
 #include "F021.h"
 
-#include "ConcentratePumps.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "RTC.h"
@@ -79,7 +78,7 @@
 #define HD_TREATMENT_TIME_ADDRESS          0x00000010 // 16                                                     ///< HD treatment time start address in RTC RAM (16).
 #define DG_CONSUMED_WATER_ADDRESS          0x00000020 // 32                                                     ///< DG water consumption start address in RTC RAM (32).
 #define SERVICE_RECORD_START_ADDRESS       0x00000030 // 48                                                     ///< Service date record start address in RTC RAM (HD/DG) (48).
-#define DG_SCHEDULED_RUNS_START_ADDRESS    (SERVICE_RECORD_START_ADDRESS  + MAX_RTC_RAM_OPS_BUFFER_BYTES)       ///< DG scheduled runs start address in RTC RAM.
+#define DG_SCHEDULED_RUNS_START_ADDRESS    (SERVICE_RECORD_START_ADDRESS + sizeof(DG_SERVICE_GROUP_T))          ///< DG scheduled runs start address in RTC RAM.
 
 // Data addresses in EEPROM
 #define CALIBRATION_RECORD_START_ADDRESS     (BANK7_SECTOR0_START_ADDRESS + sizeof(MFG_RECORD_T))  //TODO remove   ///< Calibration record start address in EEPROM.
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -rff5e595afd7ad79dd7693dfa598b24fdeacad95d -rd4aea540d447203cfd9aca91281d1dc9e9e9bc1d
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision ff5e595afd7ad79dd7693dfa598b24fdeacad95d)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision d4aea540d447203cfd9aca91281d1dc9e9e9bc1d)
@@ -3,7 +3,6 @@
 #define FWCOMMON_NVDATAMGMTDGRECORDS_H_
 
 #include "Common.h"
-#include "ConcentratePumps.h"
 
 /**
  *  @defgroup NVDataMgmtDGRecords NVDataMgmtDGRecords
@@ -95,10 +94,8 @@
 /// DG pumps enumeration.
 typedef enum dg_pumps
 {
-    CAL_DATA_CONC_PUMP_1 = 0,                                                                                  ///< Concentrate pump 1.
-    CAL_DATA_CONC_PUMP_2,                                                                                      ///< Concentrate pump 2.
-    CAL_DATA_DRAIN_PUMP,                                                                                       ///< Drain pump.
-    CAL_DATA_RO_PUMP,                                                                                          ///< RO pump.
+    CAL_DATA_CONC_PUMP_CP1 = 0,                                                                                ///< Concentrate pump 1.
+    CAL_DATA_CONC_PUMP_CP2,                                                                                    ///< Concentrate pump 2.
     NUM_OF_CAL_DATA_DG_PUMPS                                                                                   ///< Number of DG pump.
 } CAL_DATA_DG_PUMPS_T;
 
@@ -162,7 +159,7 @@
 /// DG concentrate pumps calibration record
 typedef struct
 {
-    DG_CONC_PUMPS_CAL_DATA_T concentratePump[ NUM_OF_CONCENTRATE_PUMPS ];                                       ///< DG concentrate pumps calibration data.
+    DG_CONC_PUMPS_CAL_DATA_T concentratePumps[ NUM_OF_CAL_DATA_DG_PUMPS ];                                     ///< DG concentrate pumps calibration data.
 } DG_CONC_PUMPS_CAL_RECORD_T;
 
 /// DG drain pump two-gain payload