Index: sources/model/MModel.h
===================================================================
diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r2d0bacfbe1b70055247eb40743405a5f9acb15e3
--- sources/model/MModel.h	(.../MModel.h)	(revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3)
@@ -76,8 +76,9 @@
 #include "MAdjustDGVersionsResponse.h"
 #include "MAdjustHDSerialNumberResponse.h"
 #include "MAdjustDGSerialNumberResponse.h"
-#include "MAdjustHDServiceResponse.h"
-#include "MAdjustDGServiceResponse.h"
+#include "MAdjustHDServiceModeResponse.h"
+#include "MAdjustHDServiceDatesResponse.h"
+#include "MAdjustDGServiceDatesResponse.h"
 #include "MAdjustHDDateTimeResponse.h"
 #include "MAdjustDGDateTimeResponse.h"
 
@@ -382,7 +383,8 @@
     REGISTER_METATYPE(                                       AdjustPressuresLimitsRequestData ) \
     REGISTER_METATYPE(                                             AdjustVersionsResponseData ) \
     REGISTER_METATYPE(                                              AdjustVersionsRequestData ) \
-    REGISTER_METATYPE(                                               AdjustServiceRequestData ) \
+    REGISTER_METATYPE(                                           AdjustServiceModeRequestData ) \
+    REGISTER_METATYPE(                                          AdjustServiceDatesRequestData ) \
     REGISTER_METATYPE(                                            AdjustHDDateTimeRequestData ) \
     REGISTER_METATYPE(                                            AdjustDGDateTimeRequestData ) \
     REGISTER_METATYPE(                                         AdjustHDAlarmVolumeRequestData ) \
@@ -421,8 +423,9 @@
     REGISTER_METATYPE(                                           AdjustVersionsDGResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberHDResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberDGResponseData ) \
-    REGISTER_METATYPE(                                            AdjustServiceHDResponseData ) \
-    REGISTER_METATYPE(                                            AdjustServiceDGResponseData ) \
+    REGISTER_METATYPE(                                          AdjustServiceModeResponseData ) \
+    REGISTER_METATYPE(                                       AdjustServiceDatesHDResponseData ) \
+    REGISTER_METATYPE(                                       AdjustServiceDatesDGResponseData ) \
     REGISTER_METATYPE(                                           AdjustHDDateTimeResponseData ) \
     REGISTER_METATYPE(                                           AdjustDGDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
@@ -547,8 +550,9 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberDGResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustServiceHDResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustServiceDGResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustServiceModeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustServiceDatesHDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustServiceDatesDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustHDDateTimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustDGDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
@@ -575,7 +579,8 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustVersionsRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustServiceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustServiceModeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustServiceDatesRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustHDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AdjustDGDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustHDAlarmVolumeRequestData ) \
@@ -724,8 +729,9 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberDGResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustServiceHDResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustServiceDGResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustServiceModeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustServiceDatesHDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustServiceDatesDGResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustHDDateTimeResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustDGDateTimeResponseData ) \
     /*                                      Alarms - Active List Response                    */ \
@@ -771,7 +777,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustVersionsRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustServiceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustServiceModeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                           AdjustServiceDatesRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustHDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AdjustDGDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustHDAlarmVolumeRequestData ) \
@@ -821,7 +828,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustVersionsRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustServiceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustServiceModeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                    AdjustServiceDatesRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustHDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      AdjustDGDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustHDAlarmVolumeRequestData ) \
@@ -871,7 +879,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                    AdjustTreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustVersionsRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         AdjustServiceRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustServiceModeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                    AdjustServiceDatesRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustHDDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      AdjustDGDateTimeRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustHDAlarmVolumeRequestData ) \
@@ -985,8 +994,9 @@
     ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsDGResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberHDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberDGResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                        AdjustServiceHDResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                        AdjustServiceDGResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                      AdjustServiceModeResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                   AdjustServiceDatesHDResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                   AdjustServiceDatesDGResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                       AdjustHDDateTimeResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                       AdjustDGDateTimeResponseData ) \
     /*                                      Alarms                                           */ \