Index: leahi_dialin/common/fp_defs_proxy.py
===================================================================
diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r5f16af73fb80a76c6dc767661f11a8f3508770a1
--- leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
+++ leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision 5f16af73fb80a76c6dc767661f11a8f3508770a1)
@@ -21,49 +21,54 @@
 class FP_Defs():
 
     # Operation Modes - Lvl 1
-    FPOpModes                   = fp_defs.FPOpModes
+    FPOpModes                       = fp_defs.FPOpModes
 
     # Operation Modes - Lvl 2
-    FPFaultStates               = fp_defs.FPFaultStates
-    FPServiceStates             = fp_defs.FPServiceStates
-    FPPostStates                = fp_defs.FPPostStates
-    FPStandbyStates             = fp_defs.FPStandbyStates
-    FPPreGenPermeateStates      = fp_defs.FPPreGenPermeateStates
-    FPPreGenPDefStates          = fp_defs.FPPreGenPDefStates
-    FPGenPermeateStates         = fp_defs.FPGenPermeateStates
-    FPGenPermeateDefStates      = fp_defs.FPGenPermeateDefStates
-    FPNotLegalStates            = fp_defs.FPNotLegalStates
+    FPFaultStates                   = fp_defs.FPFaultStates
+    FPServiceStates                 = fp_defs.FPServiceStates
+    FPPostStates                    = fp_defs.FPPostStates
+    FPStandbyStates                 = fp_defs.FPStandbyStates
+    FPPreGenPermeateStates          = fp_defs.FPPreGenPermeateStates
+    FPPreGenPDefStates              = fp_defs.FPPreGenPDefStates
+    FPGenPermeateStates             = fp_defs.FPGenPermeateStates
+    FPGenPermeateDefStates          = fp_defs.FPGenPermeateDefStates
+    FPNotLegalStates                = fp_defs.FPNotLegalStates
 
     # Operation Modes - Lvl 3
-    FPFaultNVDataStates         = fp_defs.FPFaultNVDataStates
-    FPInletPresCheckStates      = fp_defs.FPInletPresCheckStates
-    FPFilterFlushStates         = fp_defs.FPFilterFlushStates
-    FPPermeateFlushStates       = fp_defs.FPPermeateFlushStates
-    FPConcentrateFlushStates    = fp_defs.FPConcentrateFlushStates
-    FPDefFlushStates            = fp_defs.FPDefFlushStates
+    FPFaultNVDataStates             = fp_defs.FPFaultNVDataStates
+    FPInletPresCheckStates          = fp_defs.FPInletPresCheckStates
+    FPFilterFlushStates             = fp_defs.FPFilterFlushStates
+    FPPermeateFlushStates           = fp_defs.FPPermeateFlushStates
+    FPConcentrateFlushStates        = fp_defs.FPConcentrateFlushStates
+    FPDefFlushStates                = fp_defs.FPDefFlushStates
 
     # Events
-    FPEventList                 = fp_defs.FPEventList
-    DataTypes                   = generic_defs.DataTypes
+    FPEventList                     = fp_defs.FPEventList
+    DataTypes                       = generic_defs.DataTypes
 
     # Sensor Names
-    FPBoostPumpNames            = fp_defs.FPBoostPumpNames
-    FPConductivitySensorNames   = fp_defs.FPConductivitySensorNames
-    FPRORejectionRatioNames     = fp_defs.FPRORejectionRatioNames
-    FPFlowSensorNames           = fp_defs.FPFlowSensorNames
-    FPFloaterLevelSensorNames   = fp_defs.FPFloaterLevelSensorNames
-    FPPressureSensorNames       = fp_defs.FPPressureSensorNames
-    FPROPumpNames               = fp_defs.FPROPumpNames
-    FPTemperatureSensorNames    = fp_defs.FPTemperatureSensorNames
-    FPValveNames                = fp_defs.FPValveNames
-    FPAllPumpNames              = fp_defs.FPAllPumpNames
+    FPBoostPumpNames                = fp_defs.FPBoostPumpNames
+    FPConductivitySensorNames       = fp_defs.FPConductivitySensorNames
+    FPRORejectionRatioNames         = fp_defs.FPRORejectionRatioNames
+    FPFlowSensorNames               = fp_defs.FPFlowSensorNames
+    FPFloaterLevelSensorNames       = fp_defs.FPFloaterLevelSensorNames
+    FPPressureSensorNames           = fp_defs.FPPressureSensorNames
+    FPROPumpNames                   = fp_defs.FPROPumpNames
+    FPTemperatureSensorNames        = fp_defs.FPTemperatureSensorNames
+    FPValveNames                    = fp_defs.FPValveNames
+    FPAllPumpNames                  = fp_defs.FPAllPumpNames
 
     # Sensor Attributes
-    FPBoostPumpStates           = fp_defs.FPBoostPumpStates
-    FPFloaterLevels             = fp_defs.FPFloaterLevels
-    FPPumpAttributes            = fp_defs.FPPumpAttributes
-    FPROPumpStates              = fp_defs.FPROPumpStates
-    FPRecoveryOptions           = fp_defs.FPRecoveryOptions
-    FPValveStates               = fp_defs.FPValveStates
+    FPBoostPumpStates               = fp_defs.FPBoostPumpStates
+    FPFloaterLevels                 = fp_defs.FPFloaterLevels
+    FPPumpAttributes                = fp_defs.FPPumpAttributes
+    FPROPumpStates                  = fp_defs.FPROPumpStates
+    FPRecoveryOptions               = fp_defs.FPRecoveryOptions
+    FPValveStates                   = fp_defs.FPValveStates
 
+    # Records
+    RecordTypes                     = generic_defs.RecordTypes
+    FPServiceRecordFields           = fp_defs.FPServiceRecordFields
+    FPUsageInformationRecordFields  = fp_defs.FPUsageInformationRecordFields
+
 fp_enum_repository = FP_Defs()