Index: sources/model/MModel.h
===================================================================
diff -u -r86c040b666b2544800274db2a18ba5374fbfd4e7 -r3c07dc803109f716937b692cb4a67a5324bb9ca3
--- sources/model/MModel.h	(.../MModel.h)	(revision 86c040b666b2544800274db2a18ba5374fbfd4e7)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 3c07dc803109f716937b692cb4a67a5324bb9ca3)
@@ -62,9 +62,10 @@
 #include "MHDAccelerometerData.h"
 #include "MHDSyringePumpData.h"
 #include "MHDBloodLeakData.h"
-#include "MHDAirBubbleData.h"
 #include "MHDRTCEpochData.h"
 #include "MHDUsageInfoResponse.h"
+#include "MTDAirBubbleData.h"
+#include "MTDAirPumpData.h"
 #include "MTDAirTrapData.h"
 #include "MTDVoltageData.h"
 #include "MTDValvesData.h"
@@ -353,7 +354,8 @@
     REGISTER_METATYPE(                                                         TDSwitchesData ) \
     REGISTER_METATYPE(                                                          TDEjectorData ) \
     REGISTER_METATYPE(                                                      TDTemperatureData ) \
-    REGISTER_METATYPE(                                                        HDAirBubbleData ) \
+    REGISTER_METATYPE(                                                        TDAirBubbleData ) \
+    REGISTER_METATYPE(                                                          TDAirPumpData ) \
     REGISTER_METATYPE(                                                HDUsageInfoResponseData ) \
     REGISTER_METATYPE(                                                 HDUsageInfoRequestData ) \
     /*                                      Treatment Log                                    */ \
@@ -540,7 +542,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDBloodLeakData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 TDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDAirPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDAirTrapData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDVoltageData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TDTemperatureData ) \
@@ -746,7 +749,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDBloodLeakData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         TDAirBubbleData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDAirPumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDAirTrapData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDVoltageData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            TDValvesData ) \
@@ -1063,7 +1067,8 @@
     ACTION_RECEIVE_SIGNAL(                                                     TDSwitchesData ) \
     ACTION_RECEIVE_SIGNAL(                                                      TDEjectorData ) \
     ACTION_RECEIVE_SIGNAL(                                                  TDTemperatureData ) \
-    ACTION_RECEIVE_SIGNAL(                                                    HDAirBubbleData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    TDAirBubbleData ) \
+    ACTION_RECEIVE_SIGNAL(                                                      TDAirPumpData ) \
     /*                                      Alarms                                           */ \
     ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
     ACTION_RECEIVE_SIGNAL(                                                 AlarmTriggeredData ) \