Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r6a30402a7d47d1c77c04845a1c880935f00c6551 -r3ac9763f9bcf1246565b6309c5d1b1d6b665700c
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 6a30402a7d47d1c77c04845a1c880935f00c6551)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3ac9763f9bcf1246565b6309c5d1b1d6b665700c)
@@ -127,16 +127,10 @@
     { MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE,                                        &handleUpdateAvailable },
     { MSG_ID_UI_DD_NVM_GET_SYSTEM_RECORD_REQUEST,                                   &handleDDGetSystemRecRequest },
     { MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST,                                   &handleDDSetSystemRecRequest },
+    { MSG_ID_UI_FP_NVM_GET_SERVICE_RECORD_REQUEST,                                  &handleFPGetServicRecRequest },
+    { MSG_ID_UI_FP_NVM_SET_SERVICE_RECORD_REQUEST,                                  &handleFPSetServicRecRequest },
     { MSG_ID_UI_DD_NVM_GET_SERVICE_RECORD_REQUEST,                                  &handleDDGetServicRecRequest },
     { MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST,                                  &handleDDSetServicRecRequest },
-    { MSG_ID_UI_DD_NVM_GET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDGetInstitBasicRecRequest },
-    { MSG_ID_UI_DD_NVM_SET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDSetInstitBasicRecRequest },
-    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDGetInstitAdvancedRecRequest },
-    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDSetInstitAdvancedRecRequest },
-    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDGetInstitAdditionalRecRequest },
-    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDSetInstitAdditionalRecRequest },
-    { MSG_ID_UI_DD_NVM_GET_USAGE_INFO_RECORD_REQUEST,                               &handleDDGetUsageInfoRecRequest },
-    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleDDSetUsageInfoRecRequest },
     { MSG_ID_UI_DD_NVM_GET_PRESSURE_SENSOR_CAL_RECORD_REQUEST,                      &handleDDGetPressureSensorCalRecRequest },
     { MSG_ID_UI_DD_NVM_SET_PRESSURE_SENSOR_CAL_RECORD_REQUEST,                      &handleDDSetPressureSensorCalRecRequest },
     { MSG_ID_UI_DD_NVM_GET_TEMPERATURE_SENSOR_CAL_RECORD_REQUEST,                   &handleDDGetTemperatureSensorCalRecRequest },
@@ -157,6 +151,16 @@
     { MSG_ID_UI_DD_NVM_SET_BLOOD_LEAK_SENSOR_CAL_RECORD_REQUEST,                    &handleDDSetBloodLeakSensorCalRecRequest },
     { MSG_ID_UI_DD_NVM_GET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST,                  &handleDDGetConductivitySensorCalRecRequest },
     { MSG_ID_UI_DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_RECORD_REQUEST,                  &handleDDSetConductivitySensorCalRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDGetInstitBasicRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_BASIC_RECORD_REQUEST,                             &handleDDSetInstitBasicRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDGetInstitAdvancedRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADVANCED_RECORD_REQUEST,                          &handleDDSetInstitAdvancedRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDGetInstitAdditionalRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_INSTIT_ADDITIONAL_RECORD_REQUEST,                        &handleDDSetInstitAdditionalRecRequest },
+    { MSG_ID_UI_FP_NVM_GET_USAGE_INFO_RECORD_REQUEST,                               &handleFPGetUsageInfoRecRequest },
+    { MSG_ID_UI_FP_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleFPSetUsageInfoRecRequest },
+    { MSG_ID_UI_DD_NVM_GET_USAGE_INFO_RECORD_REQUEST,                               &handleDDGetUsageInfoRecRequest },
+    { MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST,                               &handleDDSetUsageInfoRecRequest },
     { MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                            &testValvesStatesPublishIntervalOverride },
     { MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST,                                       &testValveStateOverride },
     { MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST,                                &testValveSensedStateOverride },