Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r687dc2717d2f6b128b73526791f08d7176e447e8 -r40f46e196349e3dd730048a354df8bbb2e40407d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 687dc2717d2f6b128b73526791f08d7176e447e8)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
@@ -3199,7 +3199,12 @@
 void handleHDSerialNumberRequest( void )
 {
     MESSAGE_T msg;
-    HD_SYSTEM_RECORD_T system = getHDSystemRecord();
+    HD_SYSTEM_RECORD_T system;
+
+    // Get the system's record. There are no arrays of system to check and also, raise no alarm since the system record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SYS_RECORD, (U08*)&system, sizeof( HD_SYSTEM_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -3251,7 +3256,10 @@
 void handleHDServiceScheduleRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    HD_SERVICE_RECORD_T payload = getHDServiceRecord();
+    HD_SERVICE_RECORD_T service;
+
+    getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -3260,9 +3268,9 @@
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
     // Fill message payload
-    memcpy( payloadPtr, &payload.lastServiceEpochDate, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &payload.serviceIntervalSeconds, sizeof( U32 ) );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_UI, ACK_REQUIRED );