Index: leahi_dialin/common/generic_defs.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r2a8cf0f2bb60b82bf059519526e0b15cd08af022
--- leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022)
@@ -59,3 +59,48 @@
     'BOOL_U08': [],
     'NUM_OF_DATA_TYPES': [],
 }
+
+
+@unique
+class AlarmProperties(DialinEnum):
+    PRIORITY                = 0                                 # 
+    RANK                    = 1                                 # 
+    SOURCE                  = 2                                 # 
+    SYSTEM_FAULT            = 3                                 # 
+    DD_FAULT                = 4                                 # 
+    STOPS                   = 5                                 # 
+    CLEAR_IMMEDIATELY       = 6                                 # 
+    NO_CLEAR                = 7                                 # 
+    NO_RESUME               = 8                                 # 
+    NO_RINSEBACK            = 9                                 # 
+    NO_END_TREATMENT        = 10                                # 
+    NOT_IN_RINSEBACK        = 11                                # 
+    NOT_IN_POST_TREATMENT   = 12                                # 
+    NO_BLOOD_RECIRC         = 13                                # 
+    NO_DIAL_RECIRC          = 14                                # 
+    AUTO_RESUME             = 15                                # 
+    CLEAR_ALARM_ONLY        = 16                                # 
+    TREATMENT_LOG           = 17                                # 
+    NUM_OF_ALARM_PROPERTIES = 18                                # 
+
+AlarmProperties.STR_LIST = {
+    'PRIORITY': [],
+    'RANK': [],
+    'SOURCE': [],
+    'SYSTEM_FAULT': [],
+    'DD_FAULT': [],
+    'STOPS': [],
+    'CLEAR_IMMEDIATELY': [],
+    'NO_CLEAR': [],
+    'NO_RESUME': [],
+    'NO_RINSEBACK': [],
+    'NO_END_TREATMENT': [],
+    'NOT_IN_RINSEBACK': [],
+    'NOT_IN_POST_TREATMENT': [],
+    'NO_BLOOD_RECIRC': [],
+    'NO_DIAL_RECIRC': [],
+    'AUTO_RESUME': [],
+    'CLEAR_ALARM_ONLY': [],
+    'TREATMENT_LOG': [],
+    'NUM_OF_ALARM_PROPERTIES ': []
+}
Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 -r2a8cf0f2bb60b82bf059519526e0b15cd08af022
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022)
@@ -972,7 +972,20 @@
     'NUM_OF_AIR_PUMP_ATTRIBUTES': [],
 }
 
+class TDAirPumpStates(DialinEnum):
+    AIR_PUMP_STATE_INIT     = 0                                 # Air Pump Initialize state
+    AIR_PUMP_STATE_OFF      = 1                                 # Air Pump Off state
+    AIR_PUMP_STATE_ON       = 2                                 # Air Pump On state
+    NUM_OF_AIR_PUMP_STATES  = 3                                 # Number of air pump states
 
+TDAirPumpStates._str_list = {
+    'AIR_PUMP_STATE_INIT': ['init'],
+    'AIR_PUMP_STATE_OFF': ['off'],
+    'AIR_PUMP_STATE_ON': ['on'],
+    'NUM_OF_AIR_PUMP_STATES ': []
+}
+
+
 @unique
 class TDAirTrapLevelSensorAttributes(DialinEnum):
     LEVEL                                   = 0                 # Level attribute for Air Trap Level Sensor
Index: leahi_dialin/common/td_defs_proxy.py
===================================================================
diff -u -r636775bd0ba262967bcf06e194658b97720e2517 -r2a8cf0f2bb60b82bf059519526e0b15cd08af022
--- leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision 636775bd0ba262967bcf06e194658b97720e2517)
+++ leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision 2a8cf0f2bb60b82bf059519526e0b15cd08af022)
@@ -79,6 +79,7 @@
 
     # Sensor Attributes
     TDAirPumpAttributes                 = td_defs.TDAirPumpAttributes
+    TDAirPumpStates                     = td_defs.TDAirPumpStates
     TDAirTrapLevelSensorAttributes      = td_defs.TDAirTrapLevelSensorAttributes
     TDAirTrapState                      = td_defs.TDAirTrapState
     TDBloodFlowMotorAttributes          = td_defs.TDBloodFlowMotorAttributes
@@ -95,4 +96,7 @@
     TDTreatmentModalityTypes            = td_defs.TDTreatmentModalityTypes
     TDTreatmentHDFDilution              = td_defs.TDTreatmentHDFDilution
 
+    # Alarms
+    AlarmProperties                     = generic_defs.AlarmProperties
+
 td_enum_repository = TD_Defs()