Index: NVDataMgmt.c
===================================================================
diff -u -r1aa0b0b4cf5ecea4aabbd596a2a2fe54b0f63cf2 -r75f09f06b74c6c3b0ba67aeff6ade92fa35426d0
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1aa0b0b4cf5ecea4aabbd596a2a2fe54b0f63cf2)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 75f09f06b74c6c3b0ba67aeff6ade92fa35426d0)
@@ -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 )
Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r556ce3edecd077cc7e2c40119960379bb85d4e78 -r75f09f06b74c6c3b0ba67aeff6ade92fa35426d0
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 556ce3edecd077cc7e2c40119960379bb85d4e78)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 75f09f06b74c6c3b0ba67aeff6ade92fa35426d0)
@@ -81,6 +81,7 @@
     SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP,                                                           ///< Software configuration enable dialysate inlet pump open loop.
     SW_CONFIG_DISABLE_SWITCHES_MONITOR,                                                                        ///< Software configuration disable switches monitor.
     SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C,                                                                   ///< Software configuration enable VBA special position C.
+    SW_CONFIG_ENABLE_V3_SYSTEM,                                                                                ///< Software configuration enable V3 system.
     SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK,                                                             ///< Software configuration disable service and disinfect checks.
     NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;