Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -rbe4507c7fef6c9d987eba9e34369402e989e962e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision be4507c7fef6c9d987eba9e34369402e989e962e)
@@ -478,7 +478,12 @@
 void handleDGSerialNumberRequest( void )
 {
     MESSAGE_T msg;
-    DG_SYSTEM_RECORD_T system = getDGSystemRecord();
+    DG_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( DG_SYSTEM_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
@@ -509,18 +514,23 @@
 void handleDGServiceScheduleRequest( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-    DG_SERVICE_RECORD_T payload = getDGServiceRecord();
+    DG_SERVICE_RECORD_T service;
+
+    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( DG_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
     U08 *payloadPtr = msg.payload;
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
+    msg.hdr.msgID      = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
     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_DG_2_UI, ACK_REQUIRED );