Index: leahi_dialin/common/fp_defs_proxy.py
===================================================================
diff -u -rfbed08a9a0700196b1d9d1a11e9c4f84845fd16d -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision fbed08a9a0700196b1d9d1a11e9c4f84845fd16d)
+++ leahi_dialin/common/fp_defs_proxy.py	(.../fp_defs_proxy.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -15,11 +15,15 @@
 ############################################################################
 
 from . import fp_defs
+from . import generic_defs
 
 
 class FP_Defs():
 
+    # Operation Modes - Lvl 1
     FPOpModes                   = fp_defs.FPOpModes
+
+    # Operation Modes - Lvl 2
     FPFaultStates               = fp_defs.FPFaultStates
     FPServiceStates             = fp_defs.FPServiceStates
     FPPostStates                = fp_defs.FPPostStates
@@ -30,9 +34,19 @@
     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
+
+    # Events
     FPEventList                 = fp_defs.FPEventList
-    FPEventDataTypes            = fp_defs.FPEventDataTypes
+    DataTypes                   = generic_defs.DataTypes
 
+    # Sensor Names
     FPBoostPumpNames            = fp_defs.FPBoostPumpNames
     FPConductivitySensorNames   = fp_defs.FPConductivitySensorNames
     FPRORejectionRatioNames     = fp_defs.FPRORejectionRatioNames
@@ -44,6 +58,7 @@
     FPValveNames                = fp_defs.FPValveNames
     FPAllPumpNames              = fp_defs.FPAllPumpNames
 
+    # Sensor Attributes
     FPBoostPumpStates           = fp_defs.FPBoostPumpStates
     FPFloaterLevels             = fp_defs.FPFloaterLevels
     FPPumpAttributes            = fp_defs.FPPumpAttributes