Index: leahi_dialin/common/fp_defs_proxy.py
===================================================================
diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
+++ leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -14,39 +14,56 @@
 #
 ############################################################################
 
-from .fp_defs import *
+from . import fp_defs
+from . import generic_defs
 
 
 class FP_Defs():
 
-    FPOpModes = FPOpModes
-    FPFaultStates = FPFaultStates
-    FPServiceStates = FPServiceStates
-    FPPostStates = FPPostStates
-    FPStandbyStates = FPStandbyStates
-    FPPreGenPermeateStates = FPPreGenPermeateStates
-    FPPreGenPDefStates = FPPreGenPDefStates
-    FPGenPermeateStates = FPGenPermeateStates
-    FPGenPermeateDefStates = FPGenPermeateDefStates
-    FPNotLegalStates = FPNotLegalStates
+    # Operation Modes - Lvl 1
+    FPOpModes                   = fp_defs.FPOpModes
 
-    FPEventList= FPEventList
-    FPEventDataTypes= FPEventDataTypes
+    # 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
 
-    FPBoostPumpNames = FPBoostPumpNames
-    FPConductivitySensorNames = FPConductivitySensorNames
-    FPRORejectionRatioNames = FPRORejectionRatioNames
-    FPFlowSensorNames = FPFlowSensorNames
-    FPFloaterLevelSensorNames = FPFloaterLevelSensorNames
-    FPPressureSensorNames = FPPressureSensorNames
-    FPROPumpNames = FPROPumpNames
-    FPTemperatureSensorNames = FPTemperatureSensorNames
-    FPValveNames = FPValveNames
-    FPAllPumpNames = FPAllPumpNames
-        
-    FPFloaterLevels = FPFloaterLevels
-    FPPumpAttributes = FPPumpAttributes
-    FPPumpStates = FPPumpStates
-    FPValveStates = FPValveStates
+    # 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
 
+    # Events
+    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
+
+    # 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
+
 fp_enum_repository = FP_Defs()