Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b -re9a32dcd15e9112f38ad3de850db56e029aae861
--- leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
+++ leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision e9a32dcd15e9112f38ad3de850db56e029aae861)
@@ -15,13 +15,15 @@
 ############################################################################
 
 from . import dd_defs
+from . import generic_defs
 
 
 class DD_Defs():
-
+    # Operation Modes - Lvl 1
     DDOpModes                       = dd_defs.DDOpModes
+    
+    # Operation Modes - Lvl 2
     DDFaultStates                   = dd_defs.DDFaultStates
-    DDFaultNVDataStates             = dd_defs.DDFaultNVDataStates
     DDServiceStates                 = dd_defs.DDServiceStates
     DDInitStates                    = dd_defs.DDInitStates
     DDStandbyStates                 = dd_defs.DDStandbyStates
@@ -32,10 +34,16 @@
     DDHeaterCoolingStates           = dd_defs.DDHeaterCoolingStates
     DDROPermeateStates              = dd_defs.DDROPermeateStates
     DDNotLegalStates                = dd_defs.DDNotLegalStates
+    
+    # Operation Modes - Lvl 3
+    DDFaultNVDataStates             = dd_defs.DDFaultNVDataStates
+    DDPreGenWetSelfTestStates       = dd_defs.DDPreGenWetSelfTestStates
 
+    # Events
     DDEventList                     = dd_defs.DDEventList
-    DDEventDataTypes                = dd_defs.DDEventDataTypes
+    DataTypes                       = generic_defs.DataTypes
 
+    # Sensor Names
     DDConcentratePumpNames          = dd_defs.DDConcentratePumpNames
     DDConductivitySensorNames       = dd_defs.DDConductivitySensorNames
     DDDialysatePumpNames            = dd_defs.DDDialysatePumpNames
@@ -46,18 +54,27 @@
     DDTemperatureSensorNames        = dd_defs.DDTemperatureSensorNames
     DDValveNames                    = dd_defs.DDValveNames
     DDMonitoredVoltages             = dd_defs.DDMonitoredVoltages
+    DDSubstitutionPumpNames         = dd_defs.DDSubstitutionPumpNames
 
+    # Sensor Attributes
     DDBalancingChamberStates        = dd_defs.DDBalancingChamberStates
     DDBalancingChamberSwitchStates  = dd_defs.DDBalancingChamberSwitchStates
+    DDBicartChFFillExecStates       = dd_defs.DDBicartChFFillExecStates
     DDBloodLeakStates               = dd_defs.DDBloodLeakStates
     DDConcentratePumpAttributes     = dd_defs.DDConcentratePumpAttributes
     DDConcentratePumpStates         = dd_defs.DDConcentratePumpStates
     DDDialysatePumpAttributes       = dd_defs.DDDialysatePumpAttributes
     DDDialysatePumpsStates          = dd_defs.DDDialysatePumpsStates
+    DDDryBicartDrainExecStates      = dd_defs.DDDryBicartDrainExecStates
+    DDDryBicartFillExecStates       = dd_defs.DDDryBicartFillExecStates
     DDHeaterStartStop               = dd_defs.DDHeaterStartStop
     DDHeaterAttributes              = dd_defs.DDHeaterAttributes
     DDHeaterExecState               = dd_defs.DDHeaterExecState
     DDPistonPumpAttributes          = dd_defs.DDPistonPumpAttributes
+    DDSpentChFillExecState          = dd_defs.DDSpentChFillExecState
     DDValveStates                   = dd_defs.DDValveStates
+    DDCancelModes                   = dd_defs.DDCancelModes
+    DDSubstitutionPumpAttributes    = dd_defs.DDSubstitutionPumpAttributes
+    DDConductivityResistanceAttributes  = dd_defs.DDConductivityResistanceAttributes
 
 dd_enum_repository = DD_Defs()