diff --git a/MTC_Adapter/.vs/MTC_Adapter.sqlite b/MTC_Adapter/.vs/MTC_Adapter.sqlite
index f27e69b..cdb353b 100644
Binary files a/MTC_Adapter/.vs/MTC_Adapter.sqlite and b/MTC_Adapter/.vs/MTC_Adapter.sqlite differ
diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
index 78a1b4b..2acde2c 100644
--- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
@@ -193,7 +193,7 @@ namespace MTC_Adapter
         /// <summary>
         /// Tipo Path (LAVOR/ASSERV)
         /// </summary>
-        public MTConnect.Message mPathType;
+        public MTConnect.Event mPathType;
         /// <summary>
         /// Cod Particolare su Path
         /// </summary>
@@ -205,15 +205,15 @@ namespace MTC_Adapter
         /// <summary>
         /// Codici M sul PATH
         /// </summary>
-        public MTConnect.Message mPathCodM;
+        public MTConnect.Event mPathCodM;
         /// <summary>
         /// Codici S sul PATH
         /// </summary>
-        public MTConnect.Message mPathCodS;
+        public MTConnect.Event mPathCodS;
         /// <summary>
         /// Codici T sul PATH
         /// </summary>
-        public MTConnect.Message mPathCodT;
+        public MTConnect.Event mPathCodT;
         /// <summary>
         /// Modalità RUN del PATH: AUTO/EDIT/MDI/JOG/JOGINC/REF/HANDLE
         /// </summary>
@@ -277,11 +277,11 @@ namespace MTC_Adapter
         /// <summary>
         /// Stato dei codici G attivi
         /// </summary>
-        public MTConnect.Message mPathCodG_Act;
+        public Event mPathCodG_Act;
         /// <summary>
         /// Stato dei SubMode attivi
         /// </summary>
-        public MTConnect.Message mPathSubMode;
+        public Event mPathSubMode;
         /// <summary>
         /// Allarmi CNC del PATH
         /// </summary>
@@ -309,20 +309,20 @@ namespace MTC_Adapter
             mPathPosActJ = new Sample(string.Format("{0}_PosActJ", ident));
             mPathPosActK = new Sample(string.Format("{0}_PosActK", ident));
             // aggiunta x revisione 2016.05.05
-            mPathType = new MTConnect.Message(string.Format("{0}_Type", ident));
+            mPathType = new Event(string.Format("{0}_Type", ident));
             mPathPartId = new Event(string.Format("{0}_PartId", ident));
             mPathPartCount = new Event(string.Format("{0}_PZ_TOT", ident));
-            mPathCodM = new MTConnect.Message(string.Format("{0}_Cod_M", ident));
-            mPathCodS = new MTConnect.Message(string.Format("{0}_Cod_S", ident));
-            mPathCodT = new MTConnect.Message(string.Format("{0}_Cod_T", ident));
+            mPathCodM = new Event(string.Format("{0}_Cod_M", ident));
+            mPathCodS = new Event(string.Format("{0}_Cod_S", ident));
+            mPathCodT = new Event(string.Format("{0}_Cod_T", ident));
             mPathRunMode = new Event(string.Format("{0}_RUN_MODE", ident));
             mPathExeMode = new Event(string.Format("{0}_EXE_MODE", ident));
             mPathCurrProg = new Event(string.Format("{0}_CurrProg", ident));
             mPathCurrArea = new Event(string.Format("{0}_CurrArea", ident));
             mPathCurrProgRowNum = new Event(string.Format("{0}_CurrProg_RowNum", ident));
             mPathActiveAxes = new Event(string.Format("{0}_ActiveAxes", ident));
-            mPathCodG_Act = new MTConnect.Message(string.Format("{0}_CodG_Act", ident));
-            mPathSubMode = new MTConnect.Message(string.Format("{0}_SubMode", ident));
+            mPathCodG_Act = new Event(string.Format("{0}_CodG_Act", ident));
+            mPathSubMode = new Event(string.Format("{0}_SubMode", ident));
             mPathAlarmCNC = new Condition(string.Format("{0}_AlarmCNC", ident));
             mPathAlarmPLC = new Condition(string.Format("{0}_AlarmPLC", ident));
         }
@@ -355,7 +355,7 @@ namespace MTC_Adapter
         /// 2 : "Stroke [n]"
         /// 3 : "Distance [m]" ([ft] se la macchina è impostata in pollici)
         /// </summary>
-        public MTConnect.Message mUnOpVitaResType;
+        public Event mUnOpVitaResType;
         /// <summary>
         /// valore speed
         /// </summary>
@@ -393,7 +393,7 @@ namespace MTC_Adapter
             mUnOpSpeedOverr = new Sample(string.Format("{0}_SpeedOverr", ident));
             mUnOpLoad = new Sample(string.Format("{0}_Load", ident));
             mUnOpAccTime = new Sample(string.Format("{0}_AccTime", ident));
-            mUnOpVitaResType = new MTConnect.Message(string.Format("{0}_VitaResType", ident));
+            mUnOpVitaResType = new Event(string.Format("{0}_VitaResType", ident));
             mUnOpKRev = new Sample(string.Format("{0}_KRev", ident));
         }
     }
@@ -405,11 +405,11 @@ namespace MTC_Adapter
         /// <summary>
         /// Processo di appartenenza
         /// </summary>
-        public MTConnect.Message mAxMainProc;
+        public Event mAxMainProc;
         /// <summary>
         /// Bit se sia master (=1) o slave (=0)
         /// </summary>
-        public MTConnect.Message mAxIsMaster;
+        public Event mAxIsMaster;
         /// <summary>
         /// ID del master
         /// </summary>
@@ -506,8 +506,8 @@ namespace MTC_Adapter
 
             }
             // valori standard
-            mAxMainProc = new MTConnect.Message(string.Format("{0}_MainProc", ident));
-            mAxIsMaster = new MTConnect.Message(string.Format("{0}_IsMast", ident));
+            mAxMainProc = new Event(string.Format("{0}_MainProc", ident));
+            mAxIsMaster = new Event(string.Format("{0}_IsMast", ident));
             mAxMastId = new Event(string.Format("{0}_MastId", ident));
             mAxDir = new Event(string.Format("{0}_Dir", ident));
             mAxLoad = new Sample(string.Format("{0}_Load", ident));
@@ -902,6 +902,26 @@ namespace MTC_Adapter
         /// Stato protezioni (0/1, off/on)
         /// </summary>
         public Event mProtectionStatus = new Event("PROTECTION_STATUS");
+        /// <summary>
+        /// modalità funzionale
+        /// </summary>
+        public Event mFunctionalMode = new Event("FUNCT_MODE");
+        /// <summary>
+        /// Azioni operatore (Start/Stop/reset)
+        /// </summary>
+        public Event mUserAction = new Event("USER_ACTION");
+        /// <summary>
+        /// Testing macchina
+        /// </summary>
+        public Event mTestingData = new Event("TESTING_DATA");
+        /// <summary>
+        /// Strobe rilevati ma non qualificati
+        /// </summary>
+        public Event mUnkStrobe = new Event("UNK_STROBE");
+        /// <summary>
+        /// Status rilevati ma non qualificati
+        /// </summary>
+        public Event mUnkStatus = new Event("UNK_STATUS");
 
         #endregion
 
@@ -915,26 +935,6 @@ namespace MTC_Adapter
 
         #region Messages
 
-        /// <summary>
-        /// modalità funzionale
-        /// </summary>
-        public MTConnect.Message mFunctionalMode = new MTConnect.Message("FUNCT_MODE");
-        /// <summary>
-        /// Azioni operatore (Start/Stop/reset)
-        /// </summary>
-        public MTConnect.Message mUserAction = new MTConnect.Message("USER_ACTION");
-        /// <summary>
-        /// Testing macchina
-        /// </summary>
-        public MTConnect.Message mTestingData = new MTConnect.Message("TESTING_DATA");
-        /// <summary>
-        /// Strobe rilevati ma non qualificati
-        /// </summary>
-        public MTConnect.Message mUnkStrobe = new MTConnect.Message("UNK_STROBE");
-        /// <summary>
-        /// Status rilevati ma non qualificati
-        /// </summary>
-        public MTConnect.Message mUnkStatus = new MTConnect.Message("UNK_STATUS");
         /// <summary>
         /// Messaggi generali
         /// </summary>