Index: NVDataMgmt.c
===================================================================
diff -u -r75f09f06b74c6c3b0ba67aeff6ade92fa35426d0 -r7c59cd887d070b86c0c7d6681a29a3455562c38e
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 75f09f06b74c6c3b0ba67aeff6ade92fa35426d0)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 7c59cd887d070b86c0c7d6681a29a3455562c38e)
@@ -1437,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 )
@@ -1480,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 )
@@ -1512,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 )