diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorAnalog.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorAnalog.cs
index 4c94aa7..125e3ac 100644
--- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorAnalog.cs
+++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorAnalog.cs
@@ -149,7 +149,7 @@ namespace Aitex.Core.RT.Device.Devices
         
         public virtual bool Initialize()
         {
-            DATA.Subscribe($"{Module}.{Name}.Value", () => Value);
+            // DATA.Subscribe($"{Module}.{Name}.Value", () => Value);
             return true;
         }
 
diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorWaterFlowTemp.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorWaterFlowTemp.cs
index 0096d07..d401187 100644
--- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorWaterFlowTemp.cs
+++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoSensorWaterFlowTemp.cs
@@ -24,7 +24,6 @@ namespace Aitex.Core.RT.Device.Devices
             : base(module, node, ioModule)
         {
             _devData = new AITWaterFlowData();
-            
             _diFlowSW = ParseDiNode("diFlowSW", node, ioModule);
             
             LoadConfig();
@@ -79,6 +78,8 @@ namespace Aitex.Core.RT.Device.Devices
         public override bool Initialize()
         {
             DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData);
+            DATA.Subscribe($"{Module}.CoolingWater.{Display}.Value", () => Value);
+            DATA.Subscribe($"{Module}.CoolingWater.{Display}.FlowSensor", () => IsFlowSw);
             return base.Initialize();
         }
 
diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoWaterFlow.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoWaterFlow.cs
index 8a8eb44..c2403bf 100644
--- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoWaterFlow.cs
+++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoWaterFlow.cs
@@ -1,16 +1,10 @@
 using Aitex.Core.Common.DeviceData;
 using Aitex.Core.RT.DataCenter;
-using Aitex.Core.RT.Device;
 using Aitex.Core.RT.IOCore;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 
 using Aitex.Core.Util;
-using Aitex.Core.RT.Event;
 using Aitex.Core.RT.Log;
 
 namespace Aitex.Core.RT.Device.Devices
@@ -65,13 +59,8 @@ namespace Aitex.Core.RT.Device.Devices
                 return false;
             }
         }
-        public IoWaterFlow(string module, XmlElement node, string ioModule = "")
+        public IoWaterFlow(string module, XmlElement node, string ioModule = "") : base (module, node, ioModule)
         {
-            var attrModule = node.GetAttribute("module");
-            base.Module = string.IsNullOrEmpty(attrModule) ? module : attrModule;
-            base.Name = node.GetAttribute("id");
-            base.Display = node.GetAttribute("display");
-            base.DeviceID = node.GetAttribute("schematicId");
             _isFloatAioType = !string.IsNullOrEmpty(node.GetAttribute("aioType")) && (node.GetAttribute("aioType") == "float");
 
             _aiFeedBack = ParseAiNode("aiFeedback", node, ioModule);
@@ -84,18 +73,16 @@ namespace Aitex.Core.RT.Device.Devices
             //{
             //    _alarmText = "Alarm9  TMPump2 Water Low Flow -U6  [DI-19]";
             //}
-
-            UniqueName = Module + "." + Name;
         }
         public bool Initialize()
         {
-            DATA.Subscribe($"{Module}.{Name}.DeviceData", () => DeviceData);
-            DATA.Subscribe($"{Module}.{Name}.FeedBack", () => FeedBack);
-            DATA.Subscribe($"{Module}.{Name}.FlowSW", () => FlowSW);
+            DATA.Subscribe($"{Module}.{Display}.DeviceData", () => DeviceData);
+            DATA.Subscribe($"{Module}.{Display}.FeedBack", () => FeedBack);
+            DATA.Subscribe($"{Module}.{Display}.FlowSW", () => FlowSW);
             return false;
         }
 
-        public void Monitor()
+        protected override void HandleMonitor()
         {
             try
             {