diff --git a/MTC_Adapter/SCMA/AdapterCom/Gateway.cs b/MTC_Adapter/SCMA/AdapterCom/Gateway.cs
index 841f0a9..29c43f3 100644
--- a/MTC_Adapter/SCMA/AdapterCom/Gateway.cs
+++ b/MTC_Adapter/SCMA/AdapterCom/Gateway.cs
@@ -132,31 +132,26 @@ namespace SCMA.AdapterCom
     /// <summary>
     /// Aggiunge un generico item all'elenco di quelli tracciati (NON STRONGLY TYPED!!! occhio!!!)
     /// </summary>                     
-    /// <param name="name"></param>
-    public virtual void addConditionNode(string name)
+    /// <param name="key"></param>    
+    /// <param name="value"></param>
+    public virtual void addConditionNode(string key, object value)
     {
-      conditionNodes.Add(name, name);
+      conditionNodes.Add(key, value);
     }
     /// <summary>
     /// Rimuove TUTTI i CONDITION NODES tracciati
     /// </summary>
     public virtual void removeAllConditionNodes()
     {
-#if false
-      itemNodes.Clear(); 
-#endif
+      conditionNodes.Clear();
     }
     /// <summary>
     /// Rimuove un CONDITION NODE dall'elenco di quelli tracciati
     /// </summary>
-    /// <param name="anItem"></param>
-    public virtual void removeConditionNode(object anItem)
+    /// <param name="key">chaive</param>
+    public virtual void removeConditionNode(string key)
     {
-#if false
-      int ind = itemNodes.IndexOf(anItem);
-      if (ind >= 0)
-        itemNodes.RemoveAt(ind); 
-#endif
+      conditionNodes.Remove(key);
     }
 
     #endregion
@@ -329,8 +324,8 @@ namespace SCMA.AdapterCom
     public virtual void addAlarmNodes()
     {
       // minimo sempre PLC/CNC       
-      addConditionNode("CNC");
-      addConditionNode("PLC");
+      addConditionNode("CNC", "CNC");
+      addConditionNode("PLC", "PLC");
     }
     /// <summary>
     /// INIT allarmi a normal
diff --git a/MTC_Adapter/SCMA/AdapterCom/GatewayMTC.cs b/MTC_Adapter/SCMA/AdapterCom/GatewayMTC.cs
index 0cde4e5..69a5c8c 100644
--- a/MTC_Adapter/SCMA/AdapterCom/GatewayMTC.cs
+++ b/MTC_Adapter/SCMA/AdapterCom/GatewayMTC.cs
@@ -58,14 +58,16 @@ namespace SCMA.AdapterCom
     {
       mAdapter.RemoveDataItem((DataItem)anItem);
     }
-    public override void addConditionNode(string name)
+    /// <summary>
+    /// wrapper aggiunta condizione
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    public override void addConditionNode(string key, object value)
     {
-      // registro
-      Condition newCondNode;
-      newCondNode = new Condition(name);
-      conditionNodes.Add(name, newCondNode);
-      // aggiungo ad adapter
-      addItemNode(newCondNode);
+      conditionNodes.Add(key, value);
+      // aggiungo ad adapter      
+      mAdapter.AddDataItem((Condition)value);
     }
     /// <summary>
     /// Wrapper metodo Begin
@@ -181,16 +183,12 @@ namespace SCMA.AdapterCom
     /// </summary>
     public override void addAlarmNodes()
     {
-      base.addAlarmNodes();
-#if false
-      addConditionNode("CNC");
-      addConditionNode("PLC");
-      // trasformo i nodi in elenchi conditions e li aggiungo...
-      foreach (var item in conditionNodes)
-      {
-        addItemNode(item.Value);
-      } 
-#endif
+      // registro
+      Condition newCondNode;
+      newCondNode = new Condition("CNC");
+      addConditionNode("CNC", newCondNode);
+      newCondNode = new Condition("PLC");
+      addConditionNode("PLC", newCondNode);
     }
     /// <summary>
     /// Wrapper inizializzazione allarmi