Index: sources/model/MModel.h
===================================================================
diff -u -r9048646630717f980a852df54349805ba63773e0 -r62797b3c6e0539e22a04404e16daa7c4465e178f
--- sources/model/MModel.h	(.../MModel.h)	(revision 9048646630717f980a852df54349805ba63773e0)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
@@ -145,7 +145,13 @@
 
 // Treatment
 #include "MTreatmentAdjustRequests.h"
-#include "MTreatmentAdjustDurationResponse.h"
+#include "MTreatmentAdjustBolusVolumeResponse.h"
+#include "MTreatmentAdjustDurationEditResponse.h"
+#include "MTreatmentAdjustDurationConfirmResponse.h"
+#include "MTreatmentAdjustSetPointsResponse.h"
+#include "MTreatmentAdjustBloodFlowRateResponse.h"
+#include "MTreatmentAdjustDialysateFlowRateResponse.h"
+#include "MTreatmentAdjustDialysateTemperatureResponse.h"
 #include "MTreatmentAdjustBloodDialysateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
@@ -446,7 +452,13 @@
     REGISTER_METATYPE(                                             AlarmUserActionRequestData ) \
     REGISTER_METATYPE(                                             AlarmActiveListRequestData ) \
     REGISTER_METATYPE(                                        AdjustBloodDialysateRequestData ) \
-    REGISTER_METATYPE(                                              AdjustDurationRequestData ) \
+    REGISTER_METATYPE(                                           AdjustBolusVolumeRequestData ) \
+    REGISTER_METATYPE(                                          AdjustDurationEditRequestData ) \
+    REGISTER_METATYPE(                                       AdjustDurationConfirmRequestData ) \
+    REGISTER_METATYPE(                                             AdjustSetPointsRequestData ) \
+    REGISTER_METATYPE(                                         AdjustBloodFlowRateRequestData ) \
+    REGISTER_METATYPE(                                     AdjustDialysateFlowRateRequestData ) \
+    REGISTER_METATYPE(                                  AdjustDialysateTemperatureRequestData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationStateRequestData ) \
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
@@ -486,7 +498,13 @@
     REGISTER_METATYPE(                                      AdjustDGCleaningUsageResponseData ) \
                                                                                                 \
     REGISTER_METATYPE(                                       AdjustBloodDialysateResponseData ) \
-    REGISTER_METATYPE(                                             AdjustDurationResponseData ) \
+    REGISTER_METATYPE(                                          AdjustBolusVolumeResponseData ) \
+    REGISTER_METATYPE(                                         AdjustDurationEditResponseData ) \
+    REGISTER_METATYPE(                                      AdjustDurationConfirmResponseData ) \
+    REGISTER_METATYPE(                                            AdjustSetPointsResponseData ) \
+    REGISTER_METATYPE(                                        AdjustBloodFlowRateResponseData ) \
+    REGISTER_METATYPE(                                    AdjustDialysateFlowRateResponseData ) \
+    REGISTER_METATYPE(                                 AdjustDialysateTemperatureResponseData ) \
     REGISTER_METATYPE(                                 AdjustUltrafiltrationStateResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
@@ -643,7 +661,13 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustDGCleaningUsageResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustBolusVolumeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustDurationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustDurationConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustSetPointsResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 AdjustBloodFlowRateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             AdjustDialysateFlowRateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustDialysateTemperatureResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
@@ -682,7 +706,13 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustUIPostFinalResultRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                 AdjustBloodDialysateRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustBolusVolumeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustDurationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustDurationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustSetPointsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                  AdjustBloodFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustDialysateFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustDialysateTemperatureRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
@@ -863,7 +893,13 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustDGCleaningUsageResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustBolusVolumeResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustDurationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustDurationConfirmResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustSetPointsResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                         AdjustBloodFlowRateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                     AdjustDialysateFlowRateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustDialysateTemperatureResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                  AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
@@ -926,7 +962,13 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustDGCleaningUsageRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                         AdjustBloodDialysateRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustBolusVolumeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                           AdjustDurationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustDurationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustSetPointsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                          AdjustBloodFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustDialysateFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustDialysateTemperatureRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                   AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
@@ -987,7 +1029,13 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustDGCleaningUsageRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                  AdjustBloodDialysateRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustBolusVolumeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                    AdjustDurationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustDurationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustSetPointsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                   AdjustBloodFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustDialysateFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustDialysateTemperatureRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(            AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
@@ -1048,7 +1096,13 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustDGCleaningUsageRequestData ) \
                                                                                                 \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                  AdjustBloodDialysateRequestData ) \
-    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        AdjustDurationRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustBolusVolumeRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                    AdjustDurationEditRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustDurationConfirmRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustSetPointsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                   AdjustBloodFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustDialysateFlowRateRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustDialysateTemperatureRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustUltrafiltrationStateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
@@ -1190,7 +1244,13 @@
     ACTION_RECEIVE_SIGNAL(                                  AdjustDGCleaningUsageResponseData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                      AdjustBolusVolumeResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                     AdjustDurationEditResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                  AdjustDurationConfirmResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                        AdjustSetPointsResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                    AdjustBloodFlowRateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                AdjustDialysateFlowRateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                             AdjustDialysateTemperatureResponseData ) \
     ACTION_RECEIVE_SIGNAL(                             AdjustUltrafiltrationStateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \