Index: NVDataMgmt.c
===================================================================
diff -u -rd622dc6b4ac5023f1510cc993c71281f952f86e5 -r1f023a03f6085182f5b2b95583eb05c2e8078c58
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d622dc6b4ac5023f1510cc993c71281f952f86e5)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1f023a03f6085182f5b2b95583eb05c2e8078c58)
@@ -1294,6 +1294,7 @@
         dgUsageInfoGroup.crc                                     = crc16( (U08*)&dgUsageInfoGroup, sizeof( DG_USAGE_INFO_GROUP_T ) - sizeof( U16 ) );
 #endif
 
+        // Service record has been touched so the entire sector 0 of the EEPROM must be rewritten
         enqueueSector0Records();
         enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         // Both the usage and service records have been updated
@@ -1372,7 +1373,7 @@
         usageWriteTries                                      = 0;
         status                                               = TRUE;
 
-        enqueue( NVDATAMGMT_WRITE, NVDATAMGMT_RTC, HD_USAGE_INFO_START_ADDRESS, (U08*)&hdUsageInfoGroup, 0, sizeof( HD_USAGE_INFO_GROUP_T ) );
+        enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
@@ -1402,7 +1403,7 @@
         usageWriteTries                                   = 0;
         status                                            = TRUE;
 
-        enqueue( NVDATAMGMT_WRITE, NVDATAMGMT_RTC, HD_USAGE_INFO_START_ADDRESS, (U08*)&hdUsageInfoGroup, 0, sizeof( HD_USAGE_INFO_GROUP_T ) );
+        enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
@@ -1436,7 +1437,7 @@
         usageWriteTries                                           = 0;
         status                                                    = TRUE;
 
-        enqueueRecordJob( NVDATAMGMT_WRITE, NVDATAMGMT_RTC, NVDATAMGMT_USAGE_INFO_RECORD );
+        enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
@@ -1479,7 +1480,7 @@
         usageWriteTries                  = 0;
         status                           = TRUE;
 
-        enqueue( NVDATAMGMT_WRITE, NVDATAMGMT_RTC, DG_USAGE_INFO_START_ADDRESS, (U08*)&dgUsageInfoGroup, 0, sizeof( DG_USAGE_INFO_GROUP_T ) );
+        enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
@@ -1511,7 +1512,7 @@
         usageWriteTries                            = 0;
         status                                     = TRUE;
 
-        enqueue( NVDATAMGMT_WRITE, NVDATAMGMT_RTC, DG_USAGE_INFO_START_ADDRESS, (U08*)&dgUsageInfoGroup, 0, sizeof( DG_USAGE_INFO_GROUP_T ) );
+        enqueueRecordJob( NVDATAMGMT_WRITE, RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].dataLoc, NVDATAMGMT_USAGE_INFO_RECORD );
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )