Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -rff7652f24de0ff9249d0236df5c436b37ee6e640 -re9a32dcd15e9112f38ad3de850db56e029aae861
--- leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision ff7652f24de0ff9249d0236df5c436b37ee6e640)
+++ leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision e9a32dcd15e9112f38ad3de850db56e029aae861)
@@ -15,6 +15,7 @@
 ############################################################################
 
 from . import dd_defs
+from . import generic_defs
 
 
 class DD_Defs():
@@ -40,7 +41,7 @@
 
     # Events
     DDEventList                     = dd_defs.DDEventList
-    DDEventDataTypes                = dd_defs.DDEventDataTypes
+    DataTypes                       = generic_defs.DataTypes
 
     # Sensor Names
     DDConcentratePumpNames          = dd_defs.DDConcentratePumpNames
@@ -53,6 +54,7 @@
     DDTemperatureSensorNames        = dd_defs.DDTemperatureSensorNames
     DDValveNames                    = dd_defs.DDValveNames
     DDMonitoredVoltages             = dd_defs.DDMonitoredVoltages
+    DDSubstitutionPumpNames         = dd_defs.DDSubstitutionPumpNames
 
     # Sensor Attributes
     DDBalancingChamberStates        = dd_defs.DDBalancingChamberStates
@@ -72,5 +74,7 @@
     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()