Index: leahi_dialin/common/td_defs_proxy.py
===================================================================
diff -u -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d -rdff2704b529bfbb67b2e8c822e69e3df7d955153
--- leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d)
+++ leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision dff2704b529bfbb67b2e8c822e69e3df7d955153)
@@ -80,6 +80,7 @@
 
     # Sensor Attributes
     TDAirPumpAttributes                 = td_defs.TDAirPumpAttributes
+    TDAirPumpStates                     = td_defs.TDAirPumpStates
     TDAirTrapLevelSensorAttributes      = td_defs.TDAirTrapLevelSensorAttributes
     TDAirTrapState                      = td_defs.TDAirTrapState
     TDBloodFlowMotorAttributes          = td_defs.TDBloodFlowMotorAttributes
@@ -96,4 +97,21 @@
     TDTreatmentModalityTypes            = td_defs.TDTreatmentModalityTypes
     TDTreatmentHDFDilution              = td_defs.TDTreatmentHDFDilution
 
+    # Alarms
+    AlarmProperties                     = generic_defs.AlarmProperties
+
+    # Records
+    RecordTypes                         = generic_defs.RecordTypes
+    SystemRecordFields                  = generic_defs.SystemRecordFields
+    ServiceRecordFields                 = generic_defs.ServiceRecordFields
+    CalibrationRecordFields             = generic_defs.get_calibration_record_fields()
+    InstitutionalRecordFields           = generic_defs.InstitutionalRecordFields
+    UsageInformationRecordFields        = generic_defs.UsageInformationRecordFields
+
+    # Record support
+    CalibRecordAccelerometerFields      = generic_defs.CalibRecordAccelerometerFields
+    CalibRecordBloodLeakFields          = generic_defs.CalibRecordBloodLeakFields
+    CalibRecordConcentrateFields        = generic_defs.CalibRecordConcentrateFields
+    CalibRecordSensorFields             = generic_defs.CalibRecordSensorFields
+
 td_enum_repository = TD_Defs()