Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r5010eb0fe6fb79f67dfa73ae40331d61cd80f17b -rf480c73cfca65442ee51d0189370f4d464f026e7
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 5010eb0fe6fb79f67dfa73ae40331d61cd80f17b)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision f480c73cfca65442ee51d0189370f4d464f026e7)
@@ -18,21 +18,6 @@
 #define MAX_TOP_LEVEL_PN_CHARS 10U                                                                             ///< Max number of characters for top level part number.
 #define MAX_TOP_LEVEL_SN_CHARS 15U                                                                             ///< Max number of characters for top level serial number.
 
-/// Manufacturing location enumeration.
-typedef enum mfg_location
-{
-    MFG_LOC_FACTORY = 0,                                                                                       ///< Manufacturing location (HD/DG).
-    NUM_OF_MFG_LOC                                                                                             ///< Number of manufacturing location.
-} MFG_LOCATION_T;
-
-/// Service location enumeration.
-typedef enum service_location
-{
-    SERVICE_LOC_FACTORY = 0,                                                                                   ///< Service location factory (HD/DG).
-    SERVICE_LOC_FIELD,                                                                                         ///< Service location field (HD/DG).
-    NUM_OF_SERVICE_LOC                                                                                         ///< Number of service location.
-} SERVICE_LOCATION_T;
-
 /// DG pressure sensors enumeration.
 typedef enum dg_pressure_sensors
 {
@@ -357,16 +342,17 @@
 {
     char topLevelPN[ MAX_TOP_LEVEL_PN_CHARS ];                                                                  ///< DG top level part number.
     char topLevelSN[ MAX_TOP_LEVEL_SN_CHARS ];                                                                  ///< DG top level serial number.
-    MFG_LOCATION_T mfgLocation;                                                                                 ///< DG manufacturing location.
+    U08 mfgLocation;                                                                                            ///< DG manufacturing location.
     U32 mfgDate;                                                                                                ///< DG manufacturing date.
     U16 crc;                                                                                                    ///< CRC for the DG system record structure.
 } DG_SYSTEM_RECORD_T;
 
 /// DG service record structure
 typedef struct
 {
-    SERVICE_LOCATION_T serviceLoc;                                                                              ///< DG service location.
-    U32 serviceDate;                                                                                            ///< DG service date.
+    U08 serviceLoc;                                                                                             ///< DG service location.
+    U32 lastServiceEpochDate;                                                                                   ///< DG last service date in epoch.
+    U32 serviceIntervalSeconds;                                                                                 ///< DG service interval in seconds.
     U16 crc;                                                                                                    ///< CRC for the DG service record structure.
 } DG_SERVICE_RECORD_T;