Index: sources/model/MModel.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -r96854524927f212c24b9e4a253baeff2e672228f
--- sources/model/MModel.h	(.../MModel.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
@@ -37,7 +37,6 @@
 #include "MTreatmentRinsebackData.h"
 #include "MTreatmentRecirculateData.h"
 #include "MTreatmentBloodPrimeData.h"
-#include "MPrimingData.h"
 #include "MHDAccelerometerData.h"
 
 #include "MDGDrainPumpData.h"
@@ -50,6 +49,11 @@
 #include "MDGTemperaturesData.h"
 #include "MDGValvesStatesData.h"
 #include "MDGAccelerometerData.h"
+// Pre-Treatment progress Data
+#include "MDGFilterFlushData.h"
+#include "MPreTreatmentSelfTestNoCartridgeData.h"
+#include "MPreTreatmentSelfTestDryData.h"
+#include "MPreTreatmentPrimeData.h"
 
 #include "MTreatmentParametersResp.h"
 
@@ -229,7 +233,10 @@
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
-    REGISTER_METATYPE(                                                            PrimingData ) \
+    REGISTER_METATYPE(                                                      DGFilterFlushData ) \
+    REGISTER_METATYPE(                                    PreTreatmentSelfTestNoCartridgeData ) \
+    REGISTER_METATYPE(                                            PreTreatmentSelfTestDryData ) \
+    REGISTER_METATYPE(                                                  PreTreatmentPrimeData ) \
                                                                                                 \
     /*   Request    */                                                                          \
     REGISTER_METATYPE(                                              StartTreatmentRequestData ) \
@@ -325,7 +332,10 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     PrimingData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               DGFilterFlushData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,             PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           PreTreatmentPrimeData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      AdjustDurationResponseData ) \
@@ -426,7 +436,10 @@
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                             PrimingData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       DGFilterFlushData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                     PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                   PreTreatmentPrimeData ) \
     /*   Response   */                                                                          \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
@@ -558,7 +571,10 @@
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \
-    ACTION_RECEIVE_SIGNAL(                                                        PrimingData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  DGFilterFlushData ) \
+    ACTION_RECEIVE_SIGNAL(                                PreTreatmentSelfTestNoCartridgeData ) \
+    ACTION_RECEIVE_SIGNAL(                                        PreTreatmentSelfTestDryData ) \
+    ACTION_RECEIVE_SIGNAL(                                              PreTreatmentPrimeData ) \
     /*   Response */                                                                            \
     ACTION_RECEIVE_SIGNAL(                                         StartTreatmentResponseData ) \
                                                                                                 \