Index: NVDataMgmt.h
===================================================================
diff -u -r6d7fa72cf0e2a9d6d61b59682ab261826100562e -r2ef5e5a21d6f81900fed686b68d07da8d31f1d6d
--- NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 6d7fa72cf0e2a9d6d61b59682ab261826100562e)
+++ NVDataMgmt.h	(.../NVDataMgmt.h)	(revision 2ef5e5a21d6f81900fed686b68d07da8d31f1d6d)
@@ -21,7 +21,7 @@
 
 #define MAX_SYS_SERIAL_NUMBER_CHARACTERS 7U
 #define MAX_HW_SERIAL_NUMBER_CHARACTERS  5U
-#define MAX_MFG_DATE_CHARACTERS          10U
+#define MAX_DATE_CHARACTERS              10U
 
 typedef enum LOG_EVENT
 {
@@ -46,11 +46,17 @@
 {
     char SYSSerialNumber [ MAX_SYS_SERIAL_NUMBER_CHARACTERS ];
     char HWSerialNumber  [ MAX_HW_SERIAL_NUMBER_CHARACTERS ];
-    char mfgDate         [ MAX_MFG_DATE_CHARACTERS ];
+    char mfgDate         [ MAX_DATE_CHARACTERS ];
 } MFG_DATA_T;
 
-typedef struct calibcation_Data
+typedef struct service_dates
 {
+    char currentServiceDate [ MAX_DATE_CHARACTERS ];
+    char nextServiceDate    [ MAX_DATE_CHARACTERS ];
+} SERVICE_DATA_T;  //TODO ADD to AE
+
+typedef struct calibration_Data
+{
     F32 occSensorOffset;
     F32 tempSensorOffset;
 } CALIBRATION_DATA_T;
@@ -68,20 +74,28 @@
 
 SELF_TEST_STATUS_T execNVDataMgmtSelfTest ( void );
 
-BOOL getSerialNumber ( char buffer );
-
 BOOL setMfgData ( MFG_DATA_T data );
 
 void getMfgData ( U08* buffer );
 
+BOOL setCalibrationData ( CALIBRATION_DATA_T data ); // TODO: add to AE
+
+void getCalibrationData ( U08* buffer ); // TODO: Add to AE
+
 BOOL setTreatmentTime ( U32 mins );
 
-U32 getTreatmentTime ( void );
+U32  getTreatmentTime ( void );
 
-BOOL setLitersOfFilteredWater ( U32 liters );
+BOOL setWaterConsumption ( U32 liters );
 
+U32  getWaterConsumption ( void );  // TODO: add to AE
+
 BOOL writeLogData ( U08* data );
 
 BOOL readLogData ( READ_DATA_T* buffer, U32 length );
 
+BOOL setBootloaderFlag ( U32 flag );
+
+U32  getBootloaderFlag( void );
+
 #endif /* FWCOMMON_NVDATAMGMT_H_ */