Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457
--- 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 c6b28ca8a6aae3f70458f05b5bf445069e2fe457)
@@ -18,10 +18,11 @@
 
 
 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 +33,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
 
+    # Sensor Names
     DDConcentratePumpNames          = dd_defs.DDConcentratePumpNames
     DDConductivitySensorNames       = dd_defs.DDConductivitySensorNames
     DDDialysatePumpNames            = dd_defs.DDDialysatePumpNames
@@ -47,17 +54,27 @@
     DDValveNames                    = dd_defs.DDValveNames
     DDMonitoredVoltages             = dd_defs.DDMonitoredVoltages
 
+    # 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
 
+    # Disposables
+    DDAcidTypes                     = dd_defs.DDAcidTypes
+    DDBicarbTypes                   = dd_defs.DDBicarbTypes
+
 dd_enum_repository = DD_Defs()