Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r71f2092930ad621e8a738de12faf806e8c46b1b9 -r27cd8e0e7b47617083e8c12f73306f0ba648e687
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 71f2092930ad621e8a738de12faf806e8c46b1b9)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 27cd8e0e7b47617083e8c12f73306f0ba648e687)
@@ -16,7 +16,7 @@
 
 from enum import unique
 
-from ..utils.base import DialinEnum
+from ..utils.enums import DialinEnum
 
 
 # ================================================== Enum Creators: Operations Lvl 1 ==================================================
@@ -321,16 +321,17 @@
     DD_EVENT_SUB_MODE_CHANGE                                = 2             # DD Op sub-mode change event
     DD_EVENT_OPERATION_STATUS                               = 3             # DD operation status event
     DD_EVENT_D6_LEVL_CHANGE                                 = 4             # DD floater level change event
-    DD_EVENT_D63_LEVL_CHANGE                                = 5             # DD bicarb level change event
-    DD_EVENT_D46_LEVL_CHANGE                                = 6             # DD spent dialysate air seperation level change event
-    DD_EVENT_TD_COMMUNICATION_LOSS                          = 7             # DD TD communication loss
-    DD_EVENT_TEMPERATURE_DRIFT                              = 8             # DD dialysate temperature drift
-    DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST                     = 9             # DD blood leak zeroing request
-    DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED                    = 10            # DD blood leak zeroing required
-    DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES     = 11            # DD blood leak number of setpoint check failures
-    DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT                    = 12            # DD blood leak self test result
-    NUM_OF_DD_EVENT_IDS                                     = 13            # Total number of DD events
-
+    DD_EVENT_D63_LEVL_CHANGE                                = 5             # DD bicarb upper level change event
+    DD_EVENT_D98_LEVL_CHANGE                                = 6             # DD bicarb lower level change event
+    DD_EVENT_D46_LEVL_CHANGE                                = 7             # DD spent dialysate air seperation level change event
+    DD_EVENT_TD_COMMUNICATION_LOSS                          = 8             # DD TD communication loss
+    DD_EVENT_TEMPERATURE_DRIFT                              = 9             # DD dialysate temperature drift
+    DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST                     = 10            # DD blood leak zeroing request
+    DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED                    = 11            # DD blood leak zeroing required
+    DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES     = 12            # DD blood leak number of setpoint check failures
+    DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT                    = 13            # DD blood leak self test result
+    NUM_OF_DD_EVENT_IDS                                     = 14            # Total number of DD events
+    
 DDEventList._str_list = {
     # Official Name :       Accepted strings
     'DD_EVENT_STARTUP': ['startup'],
@@ -350,27 +351,7 @@
 }
 
 
-@unique
-class DDEventDataTypes(DialinEnum):
-    EVENT_DATA_TYPE_NONE    = 0                                 # No Event Data Type
-    EVENT_DATA_TYPE_U32     = 1                                 # Unsigned 32bit Event Data Type
-    EVENT_DATA_TYPE_S32     = 2                                 # Signed 32bit Event Data Type
-    EVENT_DATA_TYPE_F32     = 3                                 # Float 32bit Event Data Type
-    EVENT_DATA_TYPE_BOOL    = 4                                 # Boolean Event Data Type
-    NUM_OF_EVENT_DATA_TYPES = 5                                 # Number of Event Data Types
 
-DDEventDataTypes._str_list = {
-    # Official Name :               Accepted strings
-    'EVENT_DATA_TYPE_NONE': ['none'],
-    'EVENT_DATA_TYPE_U32': ['u32'],
-    'EVENT_DATA_TYPE_S32': ['s32'],
-    'EVENT_DATA_TYPE_F32': ['f32'],
-    'EVENT_DATA_TYPE_BOOL': ['bool', 'boolean'],
-    'NUM_OF_EVENT_DATA_TYPES': [],
-}
-
-
-
 # ================================================== Enum Creators: Names ==================================================
 @unique
 class DDConcentratePumpNames(DialinEnum):