diff --git a/Common/Common.csproj b/Common/Common.csproj
index c09591d31..ff7aa24ea 100644
--- a/Common/Common.csproj
+++ b/Common/Common.csproj
@@ -42,6 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BackgroundBeep.cs" />
+    <Compile Include="Enums.cs" />
     <Compile Include="Iperl\OptoTelegramRaw.cs" />
     <Compile Include="SerializableDictionary.cs" />
     <Compile Include="UIControls\CoolButtonCtrl.cs">
diff --git a/Config/Entities/Enums.cs b/Common/Enums.cs
similarity index 81%
rename from Config/Entities/Enums.cs
rename to Common/Enums.cs
index 8d26c9906..76a1de453 100644
--- a/Config/Entities/Enums.cs
+++ b/Common/Enums.cs
@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Config.Entities
+namespace Common
 {
     /// <summary>
     /// Helper class to assign descriptions to enum values
@@ -38,6 +38,115 @@ namespace Config.Entities
         }
     }
 
+    /// <summary>
+    /// Identifies the type of a database
+    /// </summary>
+    public enum DBType
+    {
+        None,               /// Database disabled
+        MySql,              /// MySQL database
+        SQLite,             /// SQLite
+        Count
+    }
+
+    /// <summary> Identifies the database based on the content </summary>
+    public enum DBKind
+    {
+        Config,
+        Results,
+        RemoteConfig,
+        Count
+    }
+
+    public enum ProcedureSelection
+    {
+#if LANG_CS
+        [Description("Žádné")]                          None,
+        [Description("Lokální postupy")]                FromLocalDB,
+        [Description("Postupy ze sdílené databázy")]    FromSharedDB,
+        [Description("Zakázky z Oracle databázy")]      OrderNrFromOracleDB,
+        [Description("Zakázky ze sledovací databázy")]  OrderNrFromTracingDB,
+#else
+        [Description("None")]                           None,
+        [Description("Local procedures")]               FromLocalDB,
+        [Description("Shared procedures")]              FromSharedDB,
+        [Description("Orders from Oracle DB")]          OrderNrFromOracleDB,
+        [Description("Orders from Tracing DB")]         OrderNrFromTracingDB,
+#endif
+        Count
+    }
+
+    /// <summary>
+    /// Obsolete - replaced by enum ProcedureSelection (above) in 3.1 and newer
+    /// </summary>
+    public enum RemoteDBUse
+    {
+        [Description("Local DB only")]          LocalDBOnly,
+        [Description("Remote DB only")]         RemoteDBOnly,
+        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
+        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
+        Count
+    }
+
+    /// <summary>
+    /// Obsolete - Contains a procedure name and a database specification (local/remote).
+    /// </summary>
+    public class ProcedureInfo
+    {
+        public readonly string Name;
+        public readonly bool IsRemote;
+
+        public ProcedureInfo(string name, bool isRemote)
+        {
+            Name = name;
+            IsRemote = isRemote;
+        }
+    }
+
+    public enum LoginMethod
+    {
+        UserName,		/// = alias, abbreviation
+        FullName,		/// = description
+        Number,
+        Count
+    }
+
+    public enum AuthorizedAs
+    {
+        PowerUser,
+        LocalUser,
+        RemoteUser,
+        Count
+    }
+
+    /// <summary>
+    /// GID-s of user groups, each user is member of one or more groups.
+    /// </summary>
+    public enum GID
+    {
+        Testers,
+        TestingSpecialists,
+        HeadOfLab,
+        MaintenanceSpecialists,
+        Metrologists,
+        CalibrationSpecialists,
+        Administrators,             /// application / network / database administrator
+        TraceabilityManagement,
+        MetrologicalAuthority,
+        WaterMeterAuthority,
+        NrOfGroups,                 /// Number of groups (this is not a GroupID)
+        None,
+    }
+
+    public enum MySortOrder
+    {
+        None,
+        Ascending,      /// The same like SortOrder.Ascending
+        Descending,     /// The same like SortOrder.Descending
+        Ascending2,     /// Sorts by a surname in ascending order in case or 'Name Surname' column
+        Descending2,    /// Sorts by a surname in descending order in case or 'Name Surname' column
+    }
+
     /// <summary>
     /// Flags returned by each device configuration control Verify(...) function.
     /// </summary>
@@ -52,28 +161,48 @@ namespace Config.Entities
         InvokeCfgChange = 0x20,	/// Invoke CfgChange handler of the component 
     }
 
-    public enum RemoteDBUse
+    /// <summary>
+    /// Event severity
+    /// </summary>
+    public enum Severity
     {
-        [Description("Local DB only")]          LocalDBOnly,
-        [Description("Remote DB only")]         RemoteDBOnly,
-        [Description("Both DB-s, local 1st")]   BothDBsLocalFirst,
-        [Description("Both DB-s, remote 1st")]  BothDBsRemoteFirst,
+        Undefined,
+        Notification,
+        Warning,
+        Error,
+        FatalError,
         Count
     }
 
-    /// <summary>
-    /// Contains a procedure name and a database specification (local/remote).
-    /// </summary>
-    public class ProcedureInfo
+    public enum EventClass
     {
-        public readonly string Name;
-        public readonly bool IsRemote;
+        Undefined,
+        EquipmentHW,
+        Metrology,
+        TestingProcess,
+        BadResults,
+        ComputerResources,
+        Network,
+        Other,
+        Count
+    }
 
-        public ProcedureInfo(string name, bool isRemote)
-        {
-            Name = name;
-            IsRemote = isRemote;
-        }
+    public enum SubscriberGroup : long
+    {
+        None = 0,
+        Metrology = 1,
+        Maintenance = 2,
+        Production = 4,
+        Management = 8,
+        Finish = 16,
+    }
+
+    public enum EViewerOption
+    {
+        Undefined,
+        AllEvents,
+        RecentEvents,
+        UnreadEvents,
     }
 
     public enum ProcedureState
@@ -424,7 +553,7 @@ namespace Config.Entities
         [Description("Fehler")]         FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Aus")]            Off,					/// The component is off
         [Description("Aufzeichnen")]    Record,
-        [Description("Reply")]          Reply,
+        [Description("Abspielen")]      Replay,
         [Description("Simuliert")]      Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Geerbt")]         Inherit,
 #elif LANG_FR
@@ -435,7 +564,7 @@ namespace Config.Entities
         [Description("Erreur d'exécution")]                 FailureDuringOperation,
         [Description("Éteindre")]                           Off,
         [Description("Record")]                             Record,
-        [Description("Répondre")]                           Reply,
+        [Description("Répondre")]                           Replay,
         [Description("Simuler")]                            Simulate,
         [Description("Hériter")]                            Inherit,
 #else
@@ -446,7 +575,7 @@ namespace Config.Entities
         [Description("Run-time error")] FailureDuringOperation,	/// Failure during operation -> disabled 
         [Description("Off")]            Off,					/// The component is off
         [Description("Record")]         Record,
-        [Description("Reply")]          Reply,
+        [Description("Replay")]         Replay,
         [Description("Simulate")]       Simulate,				/// Test bench simulation, this mode does not require any hardware
         [Description("Inherit")]        Inherit,
 #endif
@@ -584,15 +713,15 @@ namespace Config.Entities
 
     public enum ErrorFlagMask : long
     {
-        E1 = (1L << 0),    /// shift = 0, E1 = 1L
-        E2 = (1L << 1),
-        E3 = (1L << 2),
-        E4 = (1L << 3),
-        E5 = (1L << 4),
-        E6 = (1L << 5),
-        E7 = (1L << 6),
-        E8 = (1L << 7),
-        E9 = (1L << 8),
+        E1  = (1L << 0),    /// shift = 0, E1 = 1L
+        E2  = (1L << 1),
+        E3  = (1L << 2),
+        E4  = (1L << 3),
+        E5  = (1L << 4),
+        E6  = (1L << 5),
+        E7  = (1L << 6),
+        E8  = (1L << 7),
+        E9  = (1L << 8),
         E10 = (1L << 9),
         E11 = (1L << 10),
         E12 = (1L << 11),
@@ -648,4 +777,44 @@ namespace Config.Entities
         E62 = (1L << 61),
         E63 = (1L << 62),
     }
+
+    #region iPERL enums
+
+    public enum Side
+    {
+#if LANG_CS
+        [Description("Levá")]   Left,
+        [Description("Pravá")]  Right,
+#else
+        [Description("Left")]   Left,
+        [Description("Right")]  Right,
+#endif
+        Count
+    }
+
+    public enum FlowDir
+    {
+        R_L,
+        L_R,
+        Count
+    }
+
+    public enum Counting
+    {
+        Arbitrary,
+        Positive,
+        Negative,
+        Count
+    }
+
+    public enum OptoHeadState
+    {
+        Disabled,
+        OptoAndDirOK,
+        OptoNok,
+        DirNok,
+        Count
+    }
+
+    #endregion iPERL enums
 }
diff --git a/Config/Config.csproj b/Config/Config.csproj
index 0f527134e..a074e9fca 100644
--- a/Config/Config.csproj
+++ b/Config/Config.csproj
@@ -75,7 +75,6 @@
     <Compile Include="Entities\Component.cs" />
     <Compile Include="Entities\ComponentProcedure.cs" />
     <Compile Include="Entities\ComponentTest.cs" />
-    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\FeedingPath.cs" />
     <Compile Include="Entities\Group.cs" />
     <Compile Include="Entities\HeatMetersPath.cs" />
@@ -83,7 +82,6 @@
     <Compile Include="Entities\IHasName.cs" />
     <Compile Include="Entities\IHasValves.cs" />
     <Compile Include="Entities\IParamsProvider.cs" />
-    <Compile Include="Entities\IperlEnums.cs" />
     <Compile Include="Entities\MeasurementCorrection.cs" />
     <Compile Include="Entities\MetersPath.cs" />
     <Compile Include="Entities\OutputPath.cs" />
diff --git a/Config/DatabaseSettings.cs b/Config/DatabaseSettings.cs
index 7c813ead1..3db4dbd2d 100644
--- a/Config/DatabaseSettings.cs
+++ b/Config/DatabaseSettings.cs
@@ -25,10 +25,10 @@ namespace Config
         {
             BenchName = String.Empty;               /// Empty string (avoid null)
             IsRealBench = false;
-			ProceduresDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
-			WaterMetersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
-            EventsDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
-			UsersDBSettings = new Users.DBSettings(Users.Entities.DBType.MySql, string.Empty);
+			ProceduresDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
+			WaterMetersDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
+            EventsDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
+			UsersDBSettings = new Users.DBSettings(Common.DBType.MySql, string.Empty);
         }
 
         public object Clone()
diff --git a/Config/Entities/Component.cs b/Config/Entities/Component.cs
index 165bd8acb..4846a831a 100644
--- a/Config/Entities/Component.cs
+++ b/Config/Entities/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -86,7 +87,7 @@ namespace Config.Entities
             else if (line.Equals(DebugMode.FailureDuringOperation.ToString())) result.Mode = DebugMode.FailureDuringOperation;
             else if (line.Equals(DebugMode.Off.ToString())) result.Mode = DebugMode.Off;
             else if (line.Equals(DebugMode.Record.ToString())) result.Mode = DebugMode.Record;
-            else if (line.Equals(DebugMode.Reply.ToString())) result.Mode = DebugMode.Reply;
+            else if (line.Equals(DebugMode.Replay.ToString())) result.Mode = DebugMode.Replay;
             else if (line.Equals(DebugMode.Simulate.ToString())) result.Mode = DebugMode.Simulate;
             else if (line.Equals(DebugMode.Inherit.ToString())) result.Mode = DebugMode.Inherit;
 
diff --git a/Config/Entities/Group.cs b/Config/Entities/Group.cs
index 755e45a18..b68594c1b 100644
--- a/Config/Entities/Group.cs
+++ b/Config/Entities/Group.cs
@@ -9,7 +9,7 @@ namespace Config.Entities
     public class Group
     {
         public virtual int Id { get; protected set; }
-        public virtual Users.Entities.GID GID { get; set; }
+        public virtual Common.GID GID { get; set; }
         public virtual long AccessFlags { get; set; }		/// Bitfield of access flags: bit0 .. bit62
         public virtual IList<User> Users { get; set; }      /// Group can be a member of a list of users
 
@@ -18,7 +18,7 @@ namespace Config.Entities
             Users = new List<User>();
 		}
 
-        public Group(Users.Entities.GID gid)
+        public Group(Common.GID gid)
             : this()
         {
 			GID = gid;
diff --git a/Config/Entities/IParamsProvider.cs b/Config/Entities/IParamsProvider.cs
index 2df3de028..2a92d5421 100644
--- a/Config/Entities/IParamsProvider.cs
+++ b/Config/Entities/IParamsProvider.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 
 namespace Config.Entities
 {
diff --git a/Config/Entities/IperlEnums.cs b/Config/Entities/IperlEnums.cs
deleted file mode 100644
index 3a3bf135b..000000000
--- a/Config/Entities/IperlEnums.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-///
-/// Copyright (c) 2018 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Config.Entities
-{
-
-    public enum Side
-    {
-#if LANG_CS
-        [Description("Levá")]   Left,
-        [Description("Pravá")]  Right,
-#else
-        [Description("Left")]   Left,
-        [Description("Right")]  Right,
-#endif
-        Count
-    }
-
-    public enum FlowDir
-    {
-        R_L,
-        L_R,
-        Count
-    }
-
-    public enum Counting
-    {
-        Arbitrary,
-        Positive,
-        Negative,
-        Count
-    }
-
-    public enum OptoHeadState
-    {
-        Disabled,
-        OptoAndDirOK,
-        OptoNok,
-        DirNok,
-        Count
-    }
-}
diff --git a/Config/Entities/PTest.cs b/Config/Entities/PTest.cs
index 3a074540e..513fdd201 100644
--- a/Config/Entities/PTest.cs
+++ b/Config/Entities/PTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -78,7 +79,7 @@ namespace Config.Entities
             TempLimHi = 25.0;	    /// [°C]
             PressLimLo = 0;	        /// [bar]
             PressLimHi = 16.0;	    /// [bar]
-            Publish = (sbyte)Config.Entities.Publish.Always;
+            Publish = (sbyte)Common.Publish.Always;
             Evaluate = true;
 
             E1 = (sbyte)ErrorFlagsMode.On;
diff --git a/Config/Entities/Procedure.cs b/Config/Entities/Procedure.cs
index 66a7f86cd..1bf4fccf6 100644
--- a/Config/Entities/Procedure.cs
+++ b/Config/Entities/Procedure.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -78,7 +79,7 @@ namespace Config.Entities
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = Entities.MetersKind.Single;
+			MetersKind = MetersKind.Single;
 			Watermeters = string.Empty;
 			Description = string.Empty;
 			LongDescription = string.Empty;
diff --git a/Config/Entities/Profile.cs b/Config/Entities/Profile.cs
index cc11fd36e..13672a0b3 100644
--- a/Config/Entities/Profile.cs
+++ b/Config/Entities/Profile.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs
index f678f1b34..9608390ed 100644
--- a/Config/Entities/Test.cs
+++ b/Config/Entities/Test.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using Common;
 
 namespace Config.Entities
 {
@@ -25,7 +26,7 @@ namespace Config.Entities
         public virtual float Qfrom { get; set; }			/// Water flow low limit in [m3/h]
         public virtual float Qto { get; set; }				/// Water flow high limit in [m3/h]
 		public virtual float Volume { get; set; }			/// Test volume (target) in [l]
-        public virtual float TstTime { get; set; }			/// Test time (estimate) in [s]
+        public virtual float TestTime { get; set; }			/// Test time (estimate) in [s]
         public virtual string Method { get; set; }
         public virtual float ErrLimLo { get; set; }			/// in [%] usually < 0, in case of heat meters: 1=class1, 2=class2, 3=class3
         public virtual float ErrLimHi { get; set; }			/// in [%] usually > 0, in case of heat meters: -Qn in m3/h
@@ -44,7 +45,7 @@ namespace Config.Entities
         public virtual int TimeFlow2Mass { get; set; }		/// Delay time from the flow stable to the 1st mass measurement in [s]
         public virtual int TimePump2StartV { get; set; }	/// Delay time from the start of the pump to opening the start valve in [s]
         public virtual int TimeStop2Mass { get; set; }		/// Delay time from the test end (diverted) to the 2nd mass measuremen in [s]
-		public virtual double TolerRed { get; set; }		///  = Filter
+		public virtual double ShortPulses { get; set; }		///  = Filter
         public virtual string RedType { get; set; }
 		public virtual string FeedingPath { get; set; }
 		public virtual string BenchPath { get; set; }
@@ -53,9 +54,9 @@ namespace Config.Entities
 #if HEAT_METERS
         public virtual string HeatMetersPath { get; set; }
 #endif
-        public virtual string RelTransBefore { get; set; }
-		public virtual string RelTransBetween { get; set; }
-		public virtual string TransitionAfter { get; set; }
+        public virtual string TransBefore { get; set; }
+		public virtual string TransBetween { get; set; }
+		public virtual string TransAfter { get; set; }
 
         public virtual bool IsOuterLoopStart { get; set; }  /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }    /// Not mapped to database
@@ -75,7 +76,7 @@ namespace Config.Entities
 			///
             Part = 0;
             Profile = TestProfile.UserDefined;
-            Publish = (sbyte)Config.Entities.Publish.Always;
+            Publish = (sbyte)Common.Publish.Always;
 			DoEvaluate = true;
 			Repeats = 1;
 			DoDraining = false;
@@ -94,10 +95,10 @@ namespace Config.Entities
             TimeFlow2Mass = 5;				/// [s] time from the flow stable to the 1st mass measurement in [s]
             TimePump2StartV = 1;			/// [s] time from the 1st mass measurement to the test start in [s]
             TimeStop2Mass = 5;				/// [s] between the test end and the final mass measurement
-            TolerRed = 0;					/// = Filter parameter
-			RelTransBefore  = string.Empty;
-			RelTransBetween = string.Empty;
-			TransitionAfter = string.Empty;
+            ShortPulses = 0;					/// = Filter parameter
+			TransBefore  = string.Empty;
+			TransBetween = string.Empty;
+			TransAfter = string.Empty;
 		}
 
 		public Test(string name, int itemNr, Procedure procedure)
@@ -137,7 +138,7 @@ namespace Config.Entities
 			result.Qfrom = Qfrom;
             result.Qto = Qto;
 			result.Volume = Volume;
-			result.TstTime = TstTime;
+			result.TestTime = TestTime;
 			result.Method = Method;
 			result.ErrLimLo = ErrLimLo;
 			result.ErrLimHi = ErrLimHi;
@@ -156,7 +157,7 @@ namespace Config.Entities
             result.TimeFlow2Mass = TimeFlow2Mass;
             result.TimePump2StartV = TimePump2StartV;
 			result.TimeStop2Mass = TimeStop2Mass;
-			result.TolerRed = TolerRed;
+			result.ShortPulses = ShortPulses;
             result.RedType = RedType;
 			result.FeedingPath = FeedingPath;
 			result.BenchPath = BenchPath;
@@ -165,9 +166,9 @@ namespace Config.Entities
 #if HEAT_METERS
             result.HeatMetersPath = HeatMetersPath;
 #endif
-			result.RelTransBefore = RelTransBefore;
-			result.RelTransBetween = RelTransBetween;
-			result.TransitionAfter = TransitionAfter;
+			result.TransBefore = TransBefore;
+			result.TransBetween = TransBetween;
+			result.TransAfter = TransAfter;
 			foreach (var prms in MoreParams) { result.MoreParams.Add(prms.Clone()); }
 
             return result;
@@ -185,7 +186,7 @@ namespace Config.Entities
             output.WriteLine(Qfrom.ToString(ci));
             output.WriteLine(Qto.ToString(ci));
             output.WriteLine(Volume.ToString(ci));
-            output.WriteLine(TstTime.ToString(ci));
+            output.WriteLine(TestTime.ToString(ci));
             output.WriteLine(Method);
             output.WriteLine(ErrLimLo.ToString(ci));
             output.WriteLine(ErrLimHi.ToString(ci));
@@ -208,10 +209,10 @@ namespace Config.Entities
             output.WriteLine(BenchPath);
             output.WriteLine(OutputPath);
             output.WriteLine(MetersPath);
-            output.WriteLine(RelTransBefore);
-            output.WriteLine(RelTransBetween);
+            output.WriteLine(TransBefore);
+            output.WriteLine(TransBetween);
             output.WriteLine(Profile);
-            output.WriteLine(TransitionAfter);
+            output.WriteLine(TransAfter);
 
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
@@ -236,7 +237,7 @@ namespace Config.Entities
             tst.Qfrom = float.Parse(input.ReadLine(), ci);
 			tst.Qto = float.Parse(input.ReadLine(), ci);
 			tst.Volume = float.Parse(input.ReadLine(), ci);
-			tst.TstTime = float.Parse(input.ReadLine(), ci);
+			tst.TestTime = float.Parse(input.ReadLine(), ci);
             tst.Method = input.ReadLine();
 			tst.ErrLimLo = float.Parse(input.ReadLine(), ci);
 			tst.ErrLimHi = float.Parse(input.ReadLine(), ci);
@@ -259,13 +260,13 @@ namespace Config.Entities
             tst.BenchPath = input.ReadLine();
             tst.OutputPath = input.ReadLine();
             tst.MetersPath = input.ReadLine();
-            tst.RelTransBefore = input.ReadLine();
-            tst.RelTransBetween = input.ReadLine();
+            tst.TransBefore = input.ReadLine();
+            tst.TransBetween = input.ReadLine();
             string line = input.ReadLine();
             tst.Profile = line.Equals(TestProfile.ProtectedHeatMeter.ToString()) ? TestProfile.ProtectedHeatMeter
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
-            tst.TransitionAfter = input.ReadLine();
+            tst.TransAfter = input.ReadLine();
 
             while (true)
             {
@@ -298,7 +299,7 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != Qfrom.ToString(ci))              { diff.AppendFormat(fmt, "Qfrom", Qfrom.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Qto.ToString(ci))                { diff.AppendFormat(fmt, "Qto", Qto.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Volume.ToString(ci))             { diff.AppendFormat(fmt, "Volume", Volume.ToString(ci), ln); };
-            ln = inp.ReadLine(); if (ln != TstTime.ToString(ci))            { diff.AppendFormat(fmt, "TstTime", TstTime.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != TestTime.ToString(ci))           { diff.AppendFormat(fmt, "TstTime", TestTime.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != Method)                          { diff.AppendFormat(fmt, "Method", Method, ln); };
             ln = inp.ReadLine(); if (ln != ErrLimLo.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimLo", ErrLimLo.ToString(ci), ln); };
             ln = inp.ReadLine(); if (ln != ErrLimHi.ToString(ci))           { diff.AppendFormat(fmt, "ErrLimHi", ErrLimHi.ToString(ci), ln); };
@@ -321,10 +322,10 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != BenchPath)                       { diff.AppendFormat(fmt, "BenchPath", BenchPath, ln); };
             ln = inp.ReadLine(); if (ln != OutputPath)                      { diff.AppendFormat(fmt, "OutputPath", OutputPath, ln); };
             ln = inp.ReadLine(); if (ln != MetersPath)                      { diff.AppendFormat(fmt, "MetersPath", MetersPath, ln); };
-            ln = inp.ReadLine(); if (ln != RelTransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", RelTransBefore, ln); };
-            ln = inp.ReadLine(); if (ln != RelTransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", RelTransBetween, ln); };
+            ln = inp.ReadLine(); if (ln != TransBefore)                  { diff.AppendFormat(fmt, "RelTransBefore", TransBefore, ln); };
+            ln = inp.ReadLine(); if (ln != TransBetween)                 { diff.AppendFormat(fmt, "RelTransBetween", TransBetween, ln); };
             ln = inp.ReadLine(); if (ln != Profile.ToString())            { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
-            ln = inp.ReadLine(); if (ln != TransitionAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransitionAfter, ln); };
+            ln = inp.ReadLine(); if (ln != TransAfter)                 { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
 
             return diff.ToString();
         }
diff --git a/Config/FluentCommon.cs b/Config/FluentCommon.cs
index 54e321db1..fb1c82d06 100644
--- a/Config/FluentCommon.cs
+++ b/Config/FluentCommon.cs
@@ -18,7 +18,7 @@ namespace Config
         /// NHibernate session factory (to create the database session 'SessionFactory')
         /// </summary>
         /// <returns>A database session</returns>
-		public static ISessionFactory CreateSessionFactory(Users.Entities.DBKind database, Users.Entities.DBType dbType, string connectionString, bool createDB)
+		public static ISessionFactory CreateSessionFactory(Common.DBKind database, Common.DBType dbType, string connectionString, bool createDB)
         {
 			try
 			{
@@ -27,10 +27,10 @@ namespace Config
                 switch (dbType)
 				{
 					default:
-                    case Users.Entities.DBType.SQLite:
+                    case Common.DBType.SQLite:
 						cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                         break;
-                    case Users.Entities.DBType.MySql:
+                    case Common.DBType.MySql:
                         cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                         break;
 				}
@@ -38,11 +38,11 @@ namespace Config
                 switch (database)
                 {
                     default:
-					case Users.Entities.DBKind.Config:
-                    case Users.Entities.DBKind.RemoteConfig:
+					case Common.DBKind.Config:
+                    case Common.DBKind.RemoteConfig:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
-                    case Users.Entities.DBKind.Results:
+                    case Common.DBKind.Results:
                         cfg = cfg.Mappings(m => m.FluentMappings.AddFromAssemblyOf<Data>());
                         break;
                 }
@@ -89,9 +89,9 @@ namespace Config
         /// <param name="dbType">DBType.SQLite or DBType.MySql</param>
         /// <param name="connectionString">Connection string</param>
         /// <returns>true=success, false=error</returns>
-		public static bool CreateEmptyConfigDB(Users.Entities.DBType dbType, string connectionString)
+		public static bool CreateEmptyConfigDB(Common.DBType dbType, string connectionString)
 		{
-			ISessionFactory sessionFactory = CreateSessionFactory(Users.Entities.DBKind.Config, dbType, connectionString, true);
+			ISessionFactory sessionFactory = CreateSessionFactory(Common.DBKind.Config, dbType, connectionString, true);
 			if (sessionFactory == null) return false;
 
             /// Populate the database
@@ -113,23 +113,23 @@ namespace Config
                     ///
                     /// Prepare all groups, add some of them to admin
                     ///
-                    for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
+                    for (Common.GID gid = 0; gid < Common.GID.NrOfGroups; gid++)
                     {
                         Config.Entities.Group group = new Config.Entities.Group(gid);
                         switch (gid)
                         {
-                            case Users.Entities.GID.Testers:
-                            case Users.Entities.GID.TestingSpecialists:
-                            case Users.Entities.GID.HeadOfLab:
-                            case Users.Entities.GID.MaintenanceSpecialists:
-                            case Users.Entities.GID.Metrologists:
-                            case Users.Entities.GID.CalibrationSpecialists:
-                            case Users.Entities.GID.Administrators:
+                            case Common.GID.Testers:
+                            case Common.GID.TestingSpecialists:
+                            case Common.GID.HeadOfLab:
+                            case Common.GID.MaintenanceSpecialists:
+                            case Common.GID.Metrologists:
+                            case Common.GID.CalibrationSpecialists:
+                            case Common.GID.Administrators:
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                            case Users.Entities.GID.TraceabilityManagement:
+                            case Common.GID.TraceabilityManagement:
 #elif KEMPNO_50 || KRAKOW_50 || TORUN_50 || WARSAW_END
-                            case Users.Entities.GID.MetrologicalAuthority:
-                            case Users.Entities.GID.WaterMeterAuthority:
+                            case Common.GID.MetrologicalAuthority:
+                            case Common.GID.WaterMeterAuthority:
 #endif
                                 admin.AddGroup(group);
                                 session.SaveOrUpdate(group);    /// Save this group
diff --git a/Config/Mappings/TestMap.cs b/Config/Mappings/TestMap.cs
index 78956e81f..e48139e66 100644
--- a/Config/Mappings/TestMap.cs
+++ b/Config/Mappings/TestMap.cs
@@ -22,7 +22,8 @@ namespace Config.Mappings
             Map(x => x.Qfrom);
 			Map(x => x.Qto);
 			Map(x => x.Volume);
-			Map(x => x.TstTime);
+			Map(x => x.TestTime)
+                .Column("TstTime");
 			Map(x => x.Repeats);
             Map(x => x.DoDraining)
 				.Column("Emptying");
@@ -45,7 +46,7 @@ namespace Config.Mappings
 			Map(x => x.ErrLimLo);
 			Map(x => x.ErrLimHi);
 			Map(x => x.Uncertainty);
-			Map(x => x.TolerRed)
+			Map(x => x.ShortPulses)
                 .Column("TolerRed");	/// ???
 			Map(x => x.RedType);
 			Map(x => x.FeedingPath);
@@ -55,11 +56,11 @@ namespace Config.Mappings
 #if HEAT_METERS
             Map(x => x.HeatMetersPath);
 #endif
-            Map(x => x.RelTransBefore)
+            Map(x => x.TransBefore)
                 .Column("RelTransBefore");
-			Map(x => x.RelTransBetween)
+			Map(x => x.TransBetween)
                 .Column("RelTransBetween");
-			Map(x => x.TransitionAfter)
+			Map(x => x.TransAfter)
                 .Column("TransitionAfter");
 
             HasMany(x => x.MoreParams)
diff --git a/Config/Units.cs b/Config/Units.cs
index 70f21be2f..2f156c5fd 100644
--- a/Config/Units.cs
+++ b/Config/Units.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Reflection;
+using Common;
 using Config.Entities;
 
 namespace Config
diff --git a/Config/Utils.cs b/Config/Utils.cs
index a5d732007..248fc8092 100644
--- a/Config/Utils.cs
+++ b/Config/Utils.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Common;
 
 namespace Config
 {
@@ -147,7 +148,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q1 or Qmin flow in m3/h</returns>
-        public static double GetQ1Qmin(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ1Qmin(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -158,7 +159,7 @@ namespace Config
             }
             else
             {
-                if (medium == Entities.Medium.HotWater)
+                if (medium == Medium.HotWater)
                 {
                     switch (metroClass)
                     {
@@ -192,7 +193,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q2 or Qt flow in m3/h</returns>
-        public static double GetQ2Qt(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ2Qt(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
@@ -202,7 +203,7 @@ namespace Config
                 return 1.6 * Qn / (double)metroClassRatio;
             }
 
-            if (medium == Entities.Medium.HotWater)
+            if (medium == Medium.HotWater)
             {
                 switch (metroClass)
                 {
@@ -235,7 +236,7 @@ namespace Config
         /// <param name="medium">NotSpecified, ColdWater or HotWater</param>
         /// <param name="Qdflt">Default flow when metrologic does not match pattern</param>
         /// <returns>Q4 or Qmax flow in m3/h</returns>
-        public static double GetQ4Qmax(double Qn, string metroClass, Entities.Medium medium = Entities.Medium.ColdWater, double Qdflt = 0)
+        public static double GetQ4Qmax(double Qn, string metroClass, Medium medium = Medium.ColdWater, double Qdflt = 0)
         {
             if (string.IsNullOrEmpty(metroClass)) return Qdflt;
 
diff --git a/DeviceTest/DeviceTest.csproj b/DeviceTest/DeviceTest.csproj
index 71422376d..2575b3170 100644
--- a/DeviceTest/DeviceTest.csproj
+++ b/DeviceTest/DeviceTest.csproj
@@ -90,6 +90,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Config\Config.csproj">
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs
index 572358f1d..f2baca06d 100644
--- a/DeviceTest/DeviceTestDlg.cs
+++ b/DeviceTest/DeviceTestDlg.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Text;
 using System.Threading;
+using System.Xml.Serialization;
 using System.Windows.Forms;
+using Common;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
-using System.Xml.Serialization;
 
 
 namespace DeviceTest
@@ -109,8 +109,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ParentName;
 						config.ParentName = string.Empty;
 						config.ItemNr = 0;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = parentFactory;
 						parentCfg = config;
@@ -142,8 +142,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.ComponentName;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.ComponentParentName) ? string.Empty : Program.LocalSettings.ComponentParentName;
 						config.ItemNr = 1;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component1Factory;
 						component1Cfg = config;
@@ -177,8 +177,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component2Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component2ParentName) ? string.Empty : Program.LocalSettings.Component2ParentName;
 						config.ItemNr = 2;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component2Factory;
 						component2Cfg = config;
@@ -212,8 +212,8 @@ namespace DeviceTest
 						config.Name = Program.LocalSettings.Component3Name;
 						config.ParentName = string.IsNullOrEmpty(Program.LocalSettings.Component3ParentName) ? string.Empty : Program.LocalSettings.Component3ParentName;
 						config.ItemNr = 3;
-						config.DebugLevel = Config.Entities.DebugMode.Normal;
-						config.LogLevel = Config.Entities.LogLevel.Debug;
+						config.DebugLevel = DebugMode.Normal;
+						config.LogLevel = LogLevel.Debug;
 						config.Corrections = null;
 						config.Factory = component3Factory;
 						component3Cfg = config;
diff --git a/EventViewer/EventViewerWnd.cs b/EventViewer/EventViewerWnd.cs
index 73505a48c..4a354d8f7 100644
--- a/EventViewer/EventViewerWnd.cs
+++ b/EventViewer/EventViewerWnd.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using NHibernate;
+using Common;
 using Common.UIControls;
 using Events;
 using Events.Entities;
@@ -210,8 +211,8 @@ namespace EventViewer
             {
                 lvi.UseItemStyleForSubItems = false;
                 lvi.SubItems.Add(evnt.Severity.ToString());
-                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = Utils.GetSeverityColor(evnt.Severity);
-                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = Utils.GetSeverityColor(evnt.Severity, true);
+                lvi.SubItems[lvi.SubItems.Count - 1].BackColor = global::Events.Utils.GetSeverityColor(evnt.Severity);
+                lvi.SubItems[lvi.SubItems.Count - 1].ForeColor = global::Events.Utils.GetSeverityColor(evnt.Severity, true);
             }
             lvi.SubItems.Add(evnt.Message);
             eventsListView.Items.Add(lvi);
@@ -275,7 +276,7 @@ namespace EventViewer
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            //Users.Entities.GID[] groupsWithAccess = new Users.Entities.GID[] { Users.Entities.GID.Administrators };
+            //Common.GID[] groupsWithAccess = new Common.GID[] { Common.GID.Administrators };
             Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg(true);
             if (dlg.ShowDialog() == DialogResult.OK)
             {
@@ -290,7 +291,7 @@ namespace EventViewer
         {
             try
             {
-                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Users.Entities.DBType.MySql, Program.LocalSettings.UsersDBConnString);
+                Users.GlobalData.RemoteUsersDB = new Users.DBSettings(Common.DBType.MySql, Program.LocalSettings.UsersDBConnString);
                 Users.Forms.LoginDlg dlg = new Users.Forms.LoginDlg();
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {
diff --git a/Events/DB.cs b/Events/DB.cs
index 871434943..55bd153fa 100644
--- a/Events/DB.cs
+++ b/Events/DB.cs
@@ -8,6 +8,7 @@ using FluentNHibernate.Cfg.Db;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
+using Common;
 using Events.Entities;
 
 namespace Events
@@ -34,9 +35,9 @@ namespace Events
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-		private static Entities.DBType dbType;
+		private static DBType dbType;
 		/// 
-		public static Entities.DBType DbType
+		public static DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -63,10 +64,10 @@ namespace Events
 			switch (dbType)
 			{
 				default:
-				case Entities.DBType.SQLite:
+				case DBType.SQLite:
 					cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
-				case Entities.DBType.MySql:
+				case DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
 			}
diff --git a/Events/Entities/Enums.cs b/Events/Entities/Enums.cs
deleted file mode 100644
index b0d388193..000000000
--- a/Events/Entities/Enums.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-///
-/// Copyright (c) 2020 Sensus Slovensko a.s.
-///
-namespace Events.Entities
-{
-    /// <summary>
-    /// Identifies the type of a database
-    /// </summary>
-    public enum DBType
-    {
-        None,               /// Database disabled
-        MySql,              /// MySQL database
-        SQLite,             /// SQLite
-        Count
-    }
-
-
-    public enum Severity
-    {
-        Undefined,
-        Notification,
-        Warning,
-        Error,
-        FatalError,
-        Count
-    }
-
-    public enum EventClass
-    {
-        Undefined,
-        EquipmentHW,
-        Metrology,
-        TestingProcess,
-        BadResults,
-        ComputerResources,
-        Network,
-        Other,
-        Count
-    }
-
-    public enum SubscriberGroup : long
-    {
-        None = 0,
-        Metrology = 1,
-        Maintenance = 2,
-        Production = 4,
-        Management = 8,
-        Finish = 16,
-    }
-
-    public enum EViewerOption
-    {
-        Undefined,
-        AllEvents,
-        RecentEvents,
-        UnreadEvents,
-    }
-}
diff --git a/Events/Entities/Event.cs b/Events/Entities/Event.cs
index bb8c4d827..47ce4a25c 100644
--- a/Events/Entities/Event.cs
+++ b/Events/Entities/Event.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 
 namespace Events.Entities
 {
diff --git a/Events/Events.csproj b/Events/Events.csproj
index 834daf68b..346e8e7af 100644
--- a/Events/Events.csproj
+++ b/Events/Events.csproj
@@ -56,7 +56,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DB.cs" />
-    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\Event.cs" />
     <Compile Include="Entities\Subscriber.cs" />
     <Compile Include="Utils.cs" />
@@ -67,6 +66,12 @@
   <ItemGroup>
     <Folder Include="DeliveryServices\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Events/Utils.cs b/Events/Utils.cs
index 00e33a495..058526335 100644
--- a/Events/Utils.cs
+++ b/Events/Utils.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Drawing;
+using Common;
 using Events.Entities;
 
 namespace Events
diff --git a/Results/BatchResults.cs b/Results/BatchResults.cs
index 9c79519f2..46bc881a8 100644
--- a/Results/BatchResults.cs
+++ b/Results/BatchResults.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Common;
 using Results.Entities;
 
 namespace Results
@@ -71,9 +72,9 @@ namespace Results
                     RealDensity = realDensity,
                     AtTemperature = atTemperature,
                     Buoyancy = buoyancy,
-                    Compound = (procedure.MetersKind == Config.Entities.MetersKind.Combined),
+                    Compound = (procedure.MetersKind == MetersKind.Combined),
 #if HEAT_METERS
-                    HeatMeter = (procedure.MetersKind == Config.Entities.MetersKind.HeatMeter),
+                    HeatMeter = (procedure.MetersKind == MetersKind.HeatMeter),
 #endif
                 };
 
@@ -120,20 +121,20 @@ namespace Results
                         if (d.Batch.Compound)
                         {
                             /// Compound water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundMain));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.CompoundAux));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Compound));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.CompoundMain));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.CompoundAux));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.Compound));
                         }
                         else if (d.Batch.HeatMeter)
                         {
                             /// Heat meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterVolume));
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.HeatMeterEnergy));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.HeatMeterVolume));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.HeatMeterEnergy));
                         }
                         else
                         {
                             /// Water meter
-                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, Config.Entities.CompoundMeterId.Single));
+                            wmtrs.Add(new MeterTestRslt(d.Batch.WaterMeters[i], tr, CompoundMeterId.Single));
                         }
                     }
 				}
@@ -172,7 +173,7 @@ namespace Results
 			return Batch.GetTestRslt(name, part);
 		}
 
-		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, Config.Entities.CompoundMeterId meterId)
+		public MeterTestRslt GetMeterTestRslt(string name, int wmNr0, CompoundMeterId meterId)
 		{
             if (Batch.WaterMeters != null && Batch.WaterMeters.Count > wmNr0 && !Batch.WaterMeters[wmNr0].Disabled)
 			{
diff --git a/Results/DB.cs b/Results/DB.cs
index 3f7666bf6..52efe0856 100644
--- a/Results/DB.cs
+++ b/Results/DB.cs
@@ -37,9 +37,9 @@ namespace Results
 		}
 
 		/// <summary> Database type (MySQL or SQLite) for all sessions </summary>
-		private static Users.Entities.DBType dbType;
+		private static Common.DBType dbType;
 		/// 
-		public static Users.Entities.DBType DbType
+		public static Common.DBType DbType
 		{
 			get { return dbType; }
 			set { dbType = value; SessionFactory = null; }
@@ -66,10 +66,10 @@ namespace Results
 			switch (dbType)
 			{
 				default:
-				case Users.Entities.DBType.MySql:
+				case Common.DBType.MySql:
                     cfg = cfg.Database(MySQLConfiguration.Standard.ConnectionString(connectionString));
                     break;
-                case Users.Entities.DBType.SQLite:
+                case Common.DBType.SQLite:
                     cfg = cfg.Database(SQLiteConfiguration.Standard.UsingFile(connectionString));
                     break;
             }
diff --git a/Results/Entities/Batch.cs b/Results/Entities/Batch.cs
index adb40faff..ab0599931 100644
--- a/Results/Entities/Batch.cs
+++ b/Results/Entities/Batch.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -257,7 +258,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbTempStart;
             }
             return 0;
@@ -266,7 +267,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbPressStart;
             }
             return 0;
@@ -275,7 +276,7 @@ namespace Results.Entities
         {
             for (int i = 0; i < TestRslts.Count; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbHumiStart;
             }
             return 0;
@@ -285,7 +286,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbTempEnd;
             }
             return 0;
@@ -294,7 +295,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbPressEnd;
             }
             return 0;
@@ -303,7 +304,7 @@ namespace Results.Entities
         {
             for (int i = TestRslts.Count - 1; i >= 0; i++)
             {
-                if (TestRslts[i].Publish() == Config.Entities.Publish.Always)
+                if (TestRslts[i].Publish() == Publish.Always)
                     return TestRslts[i].AmbHumiEnd;
             }
             return 0;
diff --git a/Results/Entities/MeterTestRslt.cs b/Results/Entities/MeterTestRslt.cs
index 82afdf9dc..be3ba58ec 100644
--- a/Results/Entities/MeterTestRslt.cs
+++ b/Results/Entities/MeterTestRslt.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -87,23 +88,23 @@ namespace Results.Entities
 		public virtual double QRise()		  { return WaterMeter.QRise; }			/// [m3/h]
 		public virtual double QFall()		  { return WaterMeter.QFall; }			/// [m3/h]
 
-		public virtual bool                   Evaluate() { return TestData().Evaluate; }
-		public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData().Publish; }
+		public virtual bool   Evaluate()      { return TestData().Evaluate; }
+		public virtual Common.Publish Publish() { return (Publish)TestData().Publish; }
 
         public virtual WaterMeterData WaterMeterData()   { return WaterMeter.WaterMeterData; }
         public virtual Batch          Batch()            { return WaterMeter.Batch; }
 
 		public virtual bool IsPilotRslt()
 		{
-			return	(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single) ||
-					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound) ||
-					(CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy);
+			return	(CompoundMeterId == (byte)Common.CompoundMeterId.Single) ||
+					(CompoundMeterId == (byte)Common.CompoundMeterId.Compound) ||
+					(CompoundMeterId == (byte)Common.CompoundMeterId.HeatMeterEnergy);
 		}
 
-        public virtual bool IsPulses() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Pulses || RegReaderType == (int)Config.Entities.RegisterReaderType.Unknown); }
-        public virtual bool IsCamera() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Camera); }
-        public virtual bool IsDataStream() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.DataStream); }
-        public virtual bool IsManual() { return (RegReaderType == (int)Config.Entities.RegisterReaderType.Manual); }
+        public virtual bool IsPulses()     { return (RegReaderType == (int)RegisterReaderType.Pulses || RegReaderType == (int)RegisterReaderType.Unknown); }
+        public virtual bool IsCamera()     { return (RegReaderType == (int)RegisterReaderType.Camera); }
+        public virtual bool IsDataStream() { return (RegReaderType == (int)RegisterReaderType.DataStream); }
+        public virtual bool IsManual()     { return (RegReaderType == (int)RegisterReaderType.Manual); }
 
         public virtual string PassedColorStr(string yesNoFormatOrEmpty)
         {
@@ -124,7 +125,7 @@ namespace Results.Entities
 			Passed = false;
         }
 
-		public MeterTestRslt(WaterMeter waterMeterRslt, TestRslt testRslt, Config.Entities.CompoundMeterId compoundMeterId)
+		public MeterTestRslt(WaterMeter waterMeterRslt, TestRslt testRslt, CompoundMeterId compoundMeterId)
             : this()
         {
 			WaterMeter = waterMeterRslt;
diff --git a/Results/Entities/TestData.cs b/Results/Entities/TestData.cs
index 176809561..24edd6ecc 100644
--- a/Results/Entities/TestData.cs
+++ b/Results/Entities/TestData.cs
@@ -51,7 +51,7 @@ namespace Results.Entities
             Qfrom              = (double)test.Qfrom;
 			Qto                = (double)test.Qto;
 			TargetVolume       = (double)test.Volume;
-			TargetTime         = (double)test.TstTime;
+			TargetTime         = (double)test.TestTime;
 			Method             =         test.Method;
 			ErrLimLo           = (double)test.ErrLimLo;
 			ErrLimHi           = (double)test.ErrLimHi;
diff --git a/Results/Entities/TestRslt.cs b/Results/Entities/TestRslt.cs
index 0bf397a05..afd153cd1 100644
--- a/Results/Entities/TestRslt.cs
+++ b/Results/Entities/TestRslt.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using Common;
 
 namespace Results.Entities
 {
@@ -228,7 +229,7 @@ namespace Results.Entities
         public virtual float TempLimLo()     { return TestData.TempLimLo; }
         public virtual float TempLimHi()     { return TestData.TempLimHi; }
         public virtual bool Evaluate()       { return TestData.Evaluate; }
-		public virtual Config.Entities.Publish Publish() { return (Config.Entities.Publish)TestData.Publish; }
+		public virtual Publish Publish() { return (Publish)TestData.Publish; }
 
 
 		public TestRslt()
diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs
index 6d273eeec..ffd508160 100644
--- a/Results/Entities/WaterMeter.cs
+++ b/Results/Entities/WaterMeter.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Entities
@@ -329,7 +329,7 @@ namespace Results.Entities
 			return GetMeterTestRslt(testName, CompoundMeterId.SingleOrCompound);
 		}
 
-		public virtual MeterTestRslt GetMeterTestRslt(string testName, Config.Entities.CompoundMeterId meterId)
+		public virtual MeterTestRslt GetMeterTestRslt(string testName, CompoundMeterId meterId)
 		{
 			if (string.IsNullOrEmpty(testName)) return null;
 			if (Disabled) return null;
@@ -343,18 +343,15 @@ namespace Results.Entities
 					{
 						return mtr;
 					}
-					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Single)
+					else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.Single)
 					{
 						return mtr;
 					}
-					else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-							 mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.Compound)
+					else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.Compound)
 					{
 						return mtr;
 					}
-                    else if (meterId == Config.Entities.CompoundMeterId.SingleOrCompound &&
-                             mtr.CompoundMeterId == (byte)Config.Entities.CompoundMeterId.HeatMeterEnergy)
+                    else if (meterId == CompoundMeterId.SingleOrCompound && mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
                     {
                         return mtr;
                     }
@@ -518,7 +515,7 @@ namespace Results.Entities
 
             foreach (var mtr in MeterTestRslts)
             {
-                MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (Config.Entities.CompoundMeterId)mtr.CompoundMeterId);
+                MeterTestRslt srcMtr = src.GetMeterTestRslt(mtr.Name(), (CompoundMeterId)mtr.CompoundMeterId);
                 if (srcMtr != null)
                 {
                     mtr.CopyContentFrom(srcMtr);
@@ -557,8 +554,8 @@ namespace Results.Entities
                 {
                     if ((mtr.CompoundMeterId == (byte)CompoundMeterId.Single || mtr.CompoundMeterId == (byte)CompoundMeterId.Compound || mtr.CompoundMeterId == (byte)CompoundMeterId.HeatMeterEnergy)
                           && mtr.TestDone
-                          && (mtr.Publish() != Config.Entities.Publish.Never)
-                          && (mtr.Publish() != Config.Entities.Publish.Internal))
+                          && (mtr.Publish() != Publish.Never)
+                          && (mtr.Publish() != Publish.Internal))
                     {
                         testNames.Add(mtr.Name());
                     }
diff --git a/Results/Entities/WaterMeterData.cs b/Results/Entities/WaterMeterData.cs
index 71224f103..10e1b4c90 100644
--- a/Results/Entities/WaterMeterData.cs
+++ b/Results/Entities/WaterMeterData.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
-using Config.Entities;
+using Common;
 
 namespace Results.Entities
 {
@@ -204,17 +204,17 @@ namespace Results.Entities
             Producer = reader.ReadString();
             DN = reader.ReadDouble();
             L = reader.ReadDouble();
-            Mounting = (Config.Entities.Mounting)reader.ReadInt32();
+            Mounting = (Mounting)reader.ReadInt32();
             NewQnames = reader.ReadBoolean();
             Q4_Qmax = reader.ReadDouble();
             Q3_Qn = reader.ReadDouble();
             Q2_Qt = reader.ReadDouble();
             Q1_Qmin = reader.ReadDouble();
             MetrologicalClass = reader.ReadString();
-            TemperatureClass = (Config.Entities.TemperatureClass)reader.ReadInt32();
-            PressureLossClass = (Config.Entities.PressureLossClass)reader.ReadInt32();
-            MaxAdmissiblePressure = (Config.Entities.MaxAdmissiblePressure)reader.ReadInt32();
-            FlowProfileSensitivityClass = (Config.Entities.FlowProfileSensitivityClass)reader.ReadInt32();
+            TemperatureClass = (TemperatureClass)reader.ReadInt32();
+            PressureLossClass = (PressureLossClass)reader.ReadInt32();
+            MaxAdmissiblePressure = (MaxAdmissiblePressure)reader.ReadInt32();
+            FlowProfileSensitivityClass = (FlowProfileSensitivityClass)reader.ReadInt32();
             ApprovalInfo = reader.ReadString();
             Certificate = reader.ReadString();
             PulsesPerLtr = reader.ReadDouble();
@@ -222,7 +222,7 @@ namespace Results.Entities
             Q3_Qn_Aux = reader.ReadDouble();
             MetrologicalClassAux = reader.ReadString();
             ApprovalInfoAux = reader.ReadString();
-            Medium = (Config.Entities.Medium)reader.ReadInt32();
+            Medium = (Medium)reader.ReadInt32();
             Text1 = reader.ReadString();
             Text2 = reader.ReadString();
             Text3 = reader.ReadString();
diff --git a/Results/Forms/BatchResultsDlg.cs b/Results/Forms/BatchResultsDlg.cs
index 0fc15d13e..8bfd90a6a 100644
--- a/Results/Forms/BatchResultsDlg.cs
+++ b/Results/Forms/BatchResultsDlg.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using NHibernate;
 using TracingDB.Entities;
diff --git a/Results/Forms/ManualEntryConfigCtrl.cs b/Results/Forms/ManualEntryConfigCtrl.cs
index 487b9a71d..246b94791 100644
--- a/Results/Forms/ManualEntryConfigCtrl.cs
+++ b/Results/Forms/ManualEntryConfigCtrl.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using Results.Resources;
 
@@ -78,7 +79,7 @@ namespace Results.Forms
             unitsCB = new ComboBox();
 
             ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+            for (Alignment a = 0; a < Alignment.Count; a++)
             {
                 alignmentCB.Items.Add(a.ToDescription());
             }
diff --git a/Results/Forms/MoreWMResultsDlg.cs b/Results/Forms/MoreWMResultsDlg.cs
index bda644bbc..2a979e074 100644
--- a/Results/Forms/MoreWMResultsDlg.cs
+++ b/Results/Forms/MoreWMResultsDlg.cs
@@ -76,8 +76,8 @@ namespace Results.Forms
 
 //                foreach (var mtr in wMtr.MeterTestRslts)
 //                {
-//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-//                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+//                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never &&
+//                                                                            mtr.Publish() != Publish.Internal)
 //                    {
 //                        string str = item.Print(wMtr, mtr.Name());
 
diff --git a/Results/Forms/OneWMResultsColumnsCtrl.cs b/Results/Forms/OneWMResultsColumnsCtrl.cs
index 737a4bc15..7ddcf6faa 100644
--- a/Results/Forms/OneWMResultsColumnsCtrl.cs
+++ b/Results/Forms/OneWMResultsColumnsCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using Common;
 
 namespace Results.Forms
 {
@@ -107,8 +108,8 @@ namespace Results.Forms
 
                 foreach (var mtr in wMtr.MeterTestRslts)
                 {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never &&
-                                                                            mtr.Publish() != Config.Entities.Publish.Internal)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never &&
+                                                                            mtr.Publish() != Publish.Internal)
                     {
                         string str = item.Print(wMtr, mtr.Name());
 
diff --git a/Results/Forms/OneWMResultsRowsCtrl.cs b/Results/Forms/OneWMResultsRowsCtrl.cs
index fc052cf06..6534a5ca6 100644
--- a/Results/Forms/OneWMResultsRowsCtrl.cs
+++ b/Results/Forms/OneWMResultsRowsCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using Common;
 
 namespace Results.Forms
 {
@@ -109,8 +110,8 @@ namespace Results.Forms
             lView.Items.Clear();
             foreach (var mtr in wMtr.MeterTestRslts)
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Config.Entities.Publish.Never
-                                                                     && mtr.Publish() != Config.Entities.Publish.Internal)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.TestDone && mtr.Publish() != Publish.Never
+                                                                     && mtr.Publish() != Publish.Internal)
                 {
                     ListViewItem lvi = new ListViewItem(testNames[ix++]);
 
diff --git a/Results/Forms/ResultsConfigCtrl.cs b/Results/Forms/ResultsConfigCtrl.cs
index e943a20bd..df68dd2f0 100644
--- a/Results/Forms/ResultsConfigCtrl.cs
+++ b/Results/Forms/ResultsConfigCtrl.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Forms
@@ -99,7 +99,7 @@ namespace Results.Forms
             unitsCB = new ComboBox();
 
             ComboBox alignmentCB = new ComboBox();
-            for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+            for (Alignment a = 0; a < Alignment.Count; a++)
             {
                 alignmentCB.Items.Add(a.ToDescription());
             }
@@ -187,7 +187,7 @@ namespace Results.Forms
 					}
 
                 case Column.Alignment:
-                    for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+                    for (Alignment a = 0; a < Alignment.Count; a++)
                     {
                         if (a.ToDescription().Equals(editors[e.SubItem].Text))
                         {
diff --git a/Results/Forms/ResultsConfigDlg.cs b/Results/Forms/ResultsConfigDlg.cs
index 9a8fc5f3e..5c04edc7d 100644
--- a/Results/Forms/ResultsConfigDlg.cs
+++ b/Results/Forms/ResultsConfigDlg.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using Results;
 using Results.Resources;
 
diff --git a/Results/ManualEntryItemSpec.cs b/Results/ManualEntryItemSpec.cs
index 458197e75..8ac4df8d8 100644
--- a/Results/ManualEntryItemSpec.cs
+++ b/Results/ManualEntryItemSpec.cs
@@ -3,8 +3,8 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using Config;
-using Config.Entities;
 using Results.Entities;
 using Results.Resources;
 using System.Globalization;
diff --git a/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs b/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs
index 1ca9404ae..f5f0009e2 100644
--- a/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs
+++ b/Results/Output/Printers/Enhanced/EnhancedPrintDocument.cs
@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using GenCode128;
 using Gma.QrCodeNet.Encoding;
 using Results.Resources;
diff --git a/Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs b/Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs
index 1ca930fab..4a408286f 100644
--- a/Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs
+++ b/Results/Output/Printers/Enhanced/EnhancedPrinterCfg.cs
@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Enhanced
 {
 	public class EnhancedPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
         public int TopMargin;
 		public int BottomMargin;
diff --git a/Results/Output/Printers/Label/LabelPrintDocument.cs b/Results/Output/Printers/Label/LabelPrintDocument.cs
index e56476e4d..d7a9af3f3 100644
--- a/Results/Output/Printers/Label/LabelPrintDocument.cs
+++ b/Results/Output/Printers/Label/LabelPrintDocument.cs
@@ -8,7 +8,7 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using GenCode128;
 
diff --git a/Results/Output/Printers/Label/LabelPrinterCfg.cs b/Results/Output/Printers/Label/LabelPrinterCfg.cs
index 0ecc7a886..b8081bc15 100644
--- a/Results/Output/Printers/Label/LabelPrinterCfg.cs
+++ b/Results/Output/Printers/Label/LabelPrinterCfg.cs
@@ -1,13 +1,14 @@
 ///
 /// Copyright (c) 2018-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Label
 {
 	public class LabelPrinterCfg
 	{
 		public string Template;								/// Full path to a 'png' file
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
 		public int PaperWidth;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
 		public int PaperHeight;								/// In 0,254 mm = 1/100 in = 100dpi pixels count
 		public string[] ItemsToPrint;
diff --git a/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs b/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs
index 155db79a6..3a090ab11 100644
--- a/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs
+++ b/Results/Output/Printers/MultiLabel/MultiLabelPrintDocument.cs
@@ -8,7 +8,7 @@ using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
 using Gma.QrCodeNet.Encoding;
-using Config.Entities;
+using Common;
 using Results.Resources;
 using GenCode128;
 
diff --git a/Results/Output/Printers/MultiLabel/MultiLabelPrinterCfg.cs b/Results/Output/Printers/MultiLabel/MultiLabelPrinterCfg.cs
index 877495b32..0a59307b3 100644
--- a/Results/Output/Printers/MultiLabel/MultiLabelPrinterCfg.cs
+++ b/Results/Output/Printers/MultiLabel/MultiLabelPrinterCfg.cs
@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.MultiLabel
 {
 	public class MultiLabelPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public int LabelColumnsCount;
         public int LeftTopLabelLeft;
         public int LeftTopLabelTop;
diff --git a/Results/Output/Printers/Munich/MunichPrintDocument.cs b/Results/Output/Printers/Munich/MunichPrintDocument.cs
index eeb422750..834455e27 100644
--- a/Results/Output/Printers/Munich/MunichPrintDocument.cs
+++ b/Results/Output/Printers/Munich/MunichPrintDocument.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 using System.IO;
 using Results.Resources;
 
@@ -120,7 +120,7 @@ namespace Results.Output.Printers.Munich
 			resultsCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts())
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always) resultsCount++;
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always) resultsCount++;
             }
 
 			pageNr = 1;
@@ -381,7 +381,7 @@ namespace Results.Output.Printers.Munich
             int rowCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts()) 
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     if (from <= rowCount && rowCount <= to)
                     {
@@ -449,7 +449,7 @@ namespace Results.Output.Printers.Munich
             int rowCount = 0;
             foreach (var mtr in wm.RegularMeterTestRslts())
 			{
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     if (from <= rowCount && rowCount <= to)
                     {
diff --git a/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs b/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs
index e863b78ef..3d31d616b 100644
--- a/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs
+++ b/Results/Output/Printers/OnePerBatch/OnePerBatchPrintDocument.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results.Resources;
 
 namespace Results.Output.Printers.OnePerBatch
diff --git a/Results/Output/Printers/OnePerBatch/OnePerBatchPrinterCfg.cs b/Results/Output/Printers/OnePerBatch/OnePerBatchPrinterCfg.cs
index f4eeb7fc2..3812c6b21 100644
--- a/Results/Output/Printers/OnePerBatch/OnePerBatchPrinterCfg.cs
+++ b/Results/Output/Printers/OnePerBatch/OnePerBatchPrinterCfg.cs
@@ -1,13 +1,14 @@
 ///
 /// Copyright (c) 2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.OnePerBatch
 {
 	public class OnePerBatchPrinterCfg
 	{
         public string AutoTestParam;
-        public Config.Entities.PageOrientation PageOrientation;
+        public PageOrientation PageOrientation;
         public string Template;
 		public int TopMargin;
 		public int BottomMargin;
@@ -34,9 +35,9 @@ namespace Results.Output.Printers.OnePerBatch
         public string[] CommonItems1;
         public string[] CommonItems2;
         public string[] CommonItems3;
-        public Config.Entities.TableForm Form;
+        public TableForm Form;
         public string[] TestItems;
-        public Config.Entities.TableForm Form2;
+        public TableForm Form2;
         public string[] TestItems2;
         public int BelowW0Pct;
         public int BelowW1Pct;
diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
index 17a70fc06..9cb01273d 100644
--- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
+++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrintDocument.cs
@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using GenCode128;
 using Gma.QrCodeNet.Encoding;
 using Results.Resources;
diff --git a/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs b/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs
index 9a660a650..d2f991941 100644
--- a/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs
+++ b/Results/Output/Printers/OnePerMeter/OnePerMeterPrinterCfg.cs
@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.OnePerMeter
 {
 	public class OnePerMeterPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
 		public int TopMargin;
 		public int BottomMargin;
@@ -33,9 +34,9 @@ namespace Results.Output.Printers.OnePerMeter
         public string[] CommonItems1;
         public string[] CommonItems2;
         public string[] CommonItems3;
-        public Config.Entities.TableForm Form;
+        public TableForm Form;
         public string[] TestItems;
-        public Config.Entities.TableForm Form2;
+        public TableForm Form2;
         public string[] TestItems2;
         public int BelowW0Pct;
         public int BelowW1Pct;
diff --git a/Results/Output/Printers/PrintersCommon.cs b/Results/Output/Printers/PrintersCommon.cs
index 79f8c3142..f26e073ec 100644
--- a/Results/Output/Printers/PrintersCommon.cs
+++ b/Results/Output/Printers/PrintersCommon.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace Results.Output.Printers
 {
diff --git a/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs b/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs
index ea4c93085..1bc57f756 100644
--- a/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs
+++ b/Results/Output/Printers/Zapiska/ZapiskaPrintDocument.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
 using System.IO;
-using Config.Entities;
+using Common;
 using Results;
 using Results.Resources;
 
diff --git a/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs b/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs
index 804918259..686022056 100644
--- a/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs
+++ b/Results/Output/Printers/Zapiska/ZapiskaPrinterCfg.cs
@@ -1,12 +1,13 @@
 ///
 /// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
+using Common;
 
 namespace Results.Output.Printers.Zapiska
 {
 	public class ZapiskaPrinterCfg
 	{
-		public Config.Entities.PageOrientation PageOrientation;
+		public PageOrientation PageOrientation;
         public string Template;
         public int TopMargin;
 		public int BottomMargin;
diff --git a/Results/Output/SensusTestInfo.cs b/Results/Output/SensusTestInfo.cs
index b1325a2d7..8c9a60627 100644
--- a/Results/Output/SensusTestInfo.cs
+++ b/Results/Output/SensusTestInfo.cs
@@ -556,7 +556,7 @@ namespace Results.Output
                 QBezeichnungLog = fullTestNameWoPart,                       /// Flow name in Oracle database
                 Range = range,
                 Flow = (range == Range.R100_110) ? test.Qfrom : (range == Range.R90_100) ? test.Qto : (test.Qfrom + test.Qto) / 2,
-                TestTime = (int)Math.Round(test.TstTime),
+                TestTime = (int)Math.Round(test.TestTime),
                 ErrLimLoFromDB = test.ErrLimLo,
                 ErrLimHiFromDB = test.ErrLimHi,
                 Uncertainty = test.Uncertainty,
diff --git a/Results/Output/Table.cs b/Results/Output/Table.cs
index 2d825e868..811fe3570 100644
--- a/Results/Output/Table.cs
+++ b/Results/Output/Table.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace Results.Output
 {
@@ -283,7 +283,7 @@ namespace Results.Output
             WMeterRsltItemSpec.TableRowNr = 1;
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     string[] oneTableRow = new string[table.ColumnsCount];
                     horizAlignment = new Alignment[table.ColumnsCount];
@@ -317,7 +317,7 @@ namespace Results.Output
             int columnsCount = 1;          /// Left column contains item caption                         
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     columnsCount++;        /// One additional column for each test to be published
                 }
@@ -343,7 +343,7 @@ namespace Results.Output
                 WMeterRsltItemSpec.TableColumnNr = 1;
                 foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
                 {
-                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                    if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                     {
                         /// Strip color information
                         oneTableRow[WMeterRsltItemSpec.TableColumnNr] =
@@ -374,7 +374,7 @@ namespace Results.Output
             int columnsCount = 2;          /// Left two columns contain item caption and units
             foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
             {
-                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                 {
                     columnsCount++;        /// One additional column for each test to be published
                 }
@@ -410,7 +410,7 @@ namespace Results.Output
                     WMeterRsltItemSpec.TableColumnNr = 1;
                     foreach (var mtr in string.IsNullOrEmpty(autoTestParam) ? wm.RegularMeterTestRslts() : wm.AutoMeterTestRslts(autoTestParam))
                     {
-                        if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+                        if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
                         {
                             int colIx = WMeterRsltItemSpec.TableColumnNr + 1;
 
diff --git a/Results/Output/WMChart.cs b/Results/Output/WMChart.cs
index f55fdcd71..ea9c03254 100644
--- a/Results/Output/WMChart.cs
+++ b/Results/Output/WMChart.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms.DataVisualization.Charting;
-using Config.Entities;
+using Common;
 using Results.Entities;
 using Results.Resources;
 
diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs
index 364595ef0..f823a1fbc 100644
--- a/Results/WMeterRsltItemSpec.cs
+++ b/Results/WMeterRsltItemSpec.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Config;
-using Config.Entities;
+using Common;
 using Results.Entities;
 using Results.Resources;
 using System.Globalization;
@@ -28,7 +28,7 @@ namespace Results
         public string Format;		                    /// Specifies format for the output
         public string Precision;	                    /// Specifies precision for the output
         public int Width;                               /// Specifies the number of characters of the output, 0 = automatic
-        public Config.Entities.Alignment Alignment;     /// Specifies alignment for the output
+        public Alignment Alignment;                     /// Specifies alignment for the output
 
         public WMeterRsltItemSpec Clone()
         {
@@ -67,11 +67,11 @@ namespace Results
                 {
                     return str;
                 }
-                else if (Alignment == Config.Entities.Alignment.Left)
+                else if (Alignment == Alignment.Left)
                 {
                     return str + new string(' ', Width - len);
                 }
-                else if (Alignment == Config.Entities.Alignment.Right)
+                else if (Alignment == Alignment.Right)
                 {
                     return new string(' ', Width - len) + str;
                 }
@@ -423,10 +423,10 @@ namespace Results
 			AllItems.Add(new WMeterRsltItemSpec(ItemID.Meter_type,  Strings.Meter_type,  Quantity.String, ItemCategory.Other,       (w, t, u, f, p) => FormatStr(f, w.WaterMeterData.Compound ? Strings.Compound : (w.WaterMeterData.HeatMeter ? Strings.Heat_meter : Strings.Single))));
 
 #if HEAT_METERS
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
-            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, Config.Entities.CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy,           Strings.Energy + " ()",       Quantity.Energy, ItemCategory.Other,	(w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeMeter) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_start,     Strings.Energy + " start ()", Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeStart) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Energy_end,       Strings.Energy + " end ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeEnd) : string.Empty));
+            AllItems.Add(new WMeterRsltItemSpec(ItemID.Reference_energy, Strings.Energy_ref + " ()",   Quantity.Energy, ItemCategory.Other, (w, t, u, f, p) => (w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy) != null) ? FormatDbl(u, f, p, "F1", w.GetMeterTestRslt(t, CompoundMeterId.HeatMeterEnergy).VolumeRef) : string.Empty));
 #endif
 
 #if IPERL
@@ -826,7 +826,7 @@ namespace Results
 							item.Precision = field[5];
 							item.Width = int.Parse(field[6]);
 							item.Alignment = 0;
-							for (Config.Entities.Alignment a = 0; a < Config.Entities.Alignment.Count; a++)
+							for (Alignment a = 0; a < Alignment.Count; a++)
 							{
 								if (a.ToString().Equals(field[7])) { item.Alignment = a; break; }
 							}
diff --git a/ResultsBrowser/Forms/StatisticsDlg.cs b/ResultsBrowser/Forms/StatisticsDlg.cs
index 92d669a16..d06f3c18a 100644
--- a/ResultsBrowser/Forms/StatisticsDlg.cs
+++ b/ResultsBrowser/Forms/StatisticsDlg.cs
@@ -3,11 +3,12 @@
 ///
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Windows.Forms;
+using Common;
 using Results.Entities;
 using ResultsBrowser.Resources;
 using ResultsBrowser.Output.Printers.Statistics;
-using System.IO;
 
 namespace ResultsBrowser.Forms
 {
@@ -168,10 +169,10 @@ namespace ResultsBrowser.Forms
 			switch (MessageBox.Show(Strings.Yes_Portrait_No_Landscape, Strings.Page_orientation, MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question))
 			{
 				case DialogResult.Yes:
-					new StatisticsPrintDocument(title, table, Config.Entities.PageOrientation.Portrait).Print();
+					new StatisticsPrintDocument(title, table, PageOrientation.Portrait).Print();
 					break;
 				case DialogResult.No:
-					new StatisticsPrintDocument(title, table, Config.Entities.PageOrientation.Landscape).Print();
+					new StatisticsPrintDocument(title, table, PageOrientation.Landscape).Print();
 					break;
 				default:
 					break;
diff --git a/ResultsBrowser/Output/Printers/Statistics/StatisticsPrintDocument.cs b/ResultsBrowser/Output/Printers/Statistics/StatisticsPrintDocument.cs
index 82f252c83..0c8c168a2 100644
--- a/ResultsBrowser/Output/Printers/Statistics/StatisticsPrintDocument.cs
+++ b/ResultsBrowser/Output/Printers/Statistics/StatisticsPrintDocument.cs
@@ -1,11 +1,11 @@
 ///
-/// Copyright (c) 2016 Sensus Metering Systems
+/// Copyright (c) 2016 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Printing;
-using Config.Entities;
+using Common;
 
 namespace ResultsBrowser.Output.Printers.Statistics
 {
diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index 9b41bde6d..744150399 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -304,6 +304,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Config\Config.csproj">
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
diff --git a/ResultsBrowser/ResultsBrowserWnd.cs b/ResultsBrowser/ResultsBrowserWnd.cs
index a40ecf733..a3793aae3 100644
--- a/ResultsBrowser/ResultsBrowserWnd.cs
+++ b/ResultsBrowser/ResultsBrowserWnd.cs
@@ -6,14 +6,15 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using NHibernate;
+using Oracle;
+using Oracle.DataAccess.Client;
+using Common;
 using Results.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
 using ResultsBrowser.Filters;
 using ResultsBrowser.Resources;
-using Oracle;
-using Oracle.DataAccess.Client;
 
 namespace ResultsBrowser
 {
@@ -197,7 +198,7 @@ namespace ResultsBrowser
         private void formatOfResultsBtn_Click(object sender, EventArgs e)
         {
             Results.Forms.ResultsConfigDlg dlg = new Results.Forms.ResultsConfigDlg();
-            dlg.MetersKind = Config.Entities.MetersKind.Single;
+            dlg.MetersKind = MetersKind.Single;
             dlg.SelectedItems = Results.WMeterRsltItemSpec.FromStrArray(filtersConfig.ResultItems);
 
             if (dlg.ShowDialog() == DialogResult.OK)
@@ -432,7 +433,7 @@ namespace ResultsBrowser
 #if MUNICH
             foreach (var wm in waterMeters)
             {
-                new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, Config.Entities.PageOrientation.Portrait).Print();
+                new Results.Output.Printers.Munich.MunichPrintDocument(string.Format("4/13 - {0}", BenchName()), wm, PageOrientation.Portrait).Print();
             }
 #elif CEVAK_40
 			IList<Results.Entities.Batch> batches = new List<Results.Entities.Batch>();
@@ -444,7 +445,7 @@ namespace ResultsBrowser
             //foreach (var batch in batches)
             //{
             //    new Results.Output.Printers.Cevak.PrintDocumentCevak(batch,
-            //                                                         Config.Entities.PageOrientation.Portrait,
+            //                                                         PageOrientation.Portrait,
             //                                                         60, 60, 60,
             //                                                         "PT40 Z/E-35-A",
             //                                                         "0111-OOP-C035-13").Print();
@@ -822,7 +823,7 @@ namespace ResultsBrowser
 #endif
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
-                    Results.DB.DbType = Users.Entities.DBType.MySql;
+                    Results.DB.DbType = Common.DBType.MySql;
 
                     string[] fields = dlg.InputList.Split(new char[] { ',' });
                     int[] batchNrs = new int[fields.Length];
@@ -936,7 +937,7 @@ namespace ResultsBrowser
                         default: Results.DB.ConnectionString = string.Empty; break;
                     }
 #endif
-                    Results.DB.DbType = Users.Entities.DBType.MySql;
+                    Results.DB.DbType = Common.DBType.MySql;
 
                     if (!string.IsNullOrEmpty(Results.DB.ConnectionString))
                     {
diff --git a/TBF/BenchControl/Ambient/Comet/Ambient.cs b/TBF/BenchControl/Ambient/Comet/Ambient.cs
index d3f639ba3..30dc3fc0e 100644
--- a/TBF/BenchControl/Ambient/Comet/Ambient.cs
+++ b/TBF/BenchControl/Ambient/Comet/Ambient.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO.Ports;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
diff --git a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs
index ce07e2d72..df3c09572 100644
--- a/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs
+++ b/TBF/BenchControl/Ambient/Comet/AmbientCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Ambient/Greco/Ambient.cs b/TBF/BenchControl/Ambient/Greco/Ambient.cs
index 916892adb..9925af1cf 100644
--- a/TBF/BenchControl/Ambient/Greco/Ambient.cs
+++ b/TBF/BenchControl/Ambient/Greco/Ambient.cs
@@ -7,7 +7,7 @@ using System.Globalization;
 using System.IO.Ports;
 using System.Text;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
diff --git a/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs b/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs
index aa5c6c37d..74e2355f6 100644
--- a/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs
+++ b/TBF/BenchControl/Ambient/Greco/AmbientCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/ComponentBase.cs b/TBF/BenchControl/ComponentBase.cs
index a828a7f93..3f6fbfe22 100644
--- a/TBF/BenchControl/ComponentBase.cs
+++ b/TBF/BenchControl/ComponentBase.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/ComponentCfgBase.cs b/TBF/BenchControl/ComponentCfgBase.cs
index d0789dfee..7106c742c 100644
--- a/TBF/BenchControl/ComponentCfgBase.cs
+++ b/TBF/BenchControl/ComponentCfgBase.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Configs/ConfigCtrlUtils.cs b/TBF/BenchControl/Configs/ConfigCtrlUtils.cs
index 8de35ae79..6569bc6f8 100644
--- a/TBF/BenchControl/Configs/ConfigCtrlUtils.cs
+++ b/TBF/BenchControl/Configs/ConfigCtrlUtils.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs b/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs
index 79562fde6..c178de867 100644
--- a/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/Configs/NameOnly/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs b/TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs
index 4bb1074e4..c7b43de16 100644
--- a/TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs
+++ b/TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Danfoss/VLT2800/Pump.cs b/TBF/BenchControl/Danfoss/VLT2800/Pump.cs
index 9bd74d13f..e4ecaa1ca 100644
--- a/TBF/BenchControl/Danfoss/VLT2800/Pump.cs
+++ b/TBF/BenchControl/Danfoss/VLT2800/Pump.cs
@@ -7,7 +7,7 @@ using System.Globalization;
 using System.IO.Ports;
 using System.Text;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 using Dirichlet.Numerics;
diff --git a/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs
index 70043558e..be9702802 100644
--- a/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs
+++ b/TBF/BenchControl/Danfoss/VLT2800/PumpCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs
index 0946def52..310189aa4 100644
--- a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs
+++ b/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs b/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs
index 42a87c148..c1088ab67 100644
--- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs
+++ b/TBF/BenchControl/DataContainers/BenchInfo/Extended/Component.cs
@@ -5,8 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using log4net;
-using Config.Entities;
-using TBF.BenchControl;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.DataContainers.BenchInfo.Extended
diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs
index 3c658b9c7..f7fe136c3 100644
--- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs
+++ b/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs
index c9a083429..72fa4948f 100644
--- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs
+++ b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/Component.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs
index 873297305..8f90cd676 100644
--- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs
+++ b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs b/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs
index 7fc47cd19..bc1167d16 100644
--- a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs
+++ b/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs b/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs
index e0ccdec7b..083d04d55 100644
--- a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs
+++ b/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs b/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs
index cc0590472..9ed754d3b 100644
--- a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs
+++ b/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs
index 2b0b6c297..c371986dc 100644
--- a/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Combined/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs
index 5be283884..56dd46263 100644
--- a/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs
+++ b/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.cs
index 147a165f9..5c4c95164 100644
--- a/TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Fewa/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs
index 69577f483..410498cac 100644
--- a/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs
index 4ff8b89fc..ac7f795b5 100644
--- a/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs
index 4fcf58cf2..2c539ca01 100644
--- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Munich/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs
index 257b1d98d..c63db0472 100644
--- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs
index 2cc13837c..e70c4bbad 100644
--- a/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Single/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Single/EntryFormCfgCtrl.cs
index ec253070a..73409222c 100644
--- a/TBF/BenchControl/DataEntry/Single/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Single/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs
index 083559fb1..e0f454adb 100644
--- a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
index a7bce7d23..2cf9b479d 100644
--- a/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs
index 5be7590be..2b4bdcc31 100644
--- a/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
index 087c5686b..91d204b16 100644
--- a/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs
index 409facda2..d1469fe15 100644
--- a/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs
+++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryForm.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.GenericDevices;
diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs
index 649b510de..a1e4bd377 100644
--- a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs
index 182fd9321..f9daf9175 100644
--- a/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
index 3617e61b1..bdc3f24be 100644
--- a/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
+++ b/TBF/BenchControl/DataEntry/iPerl/CycleBeginningForm.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using TBF.Resources;
 using System.Drawing;
 
@@ -63,20 +64,20 @@ namespace TBF.BenchControl.DataEntry.iPerl
             ///
             /// Draw an appropriate test bench picture
             ///
-            Config.Entities.Side side = (TBF.BenchControl.Sequences.ProcessData.BenchInfo is DataContainers.BenchInfo.iPerl.Component)
+            Side side = (TBF.BenchControl.Sequences.ProcessData.BenchInfo is DataContainers.BenchInfo.iPerl.Component)
                                       ? (TBF.BenchControl.Sequences.ProcessData.BenchInfo as DataContainers.BenchInfo.iPerl.Component).Side
-                                      : Config.Entities.Side.Left;
-            if (reversedDirection && (side == Config.Entities.Side.Left))
+                                      : Side.Left;
+            if (reversedDirection && (side == Side.Left))
             {
                 /// direction L->R (reversed), left side
                 pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_left.jpg", Program.ExecutableDir, true));
             }
-            else if (reversedDirection && (side == Config.Entities.Side.Right))
+            else if (reversedDirection && (side == Side.Right))
             {
                 /// direction L->R (reversed), right side
                 pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\reversed_dir_right.jpg", Program.ExecutableDir, true));
             }
-            else if (side == Config.Entities.Side.Right)
+            else if (side == Side.Right)
             {
                 /// direction R->L (forward), right side
                 pictureBox.Image = Image.FromFile(string.Format("{0}\\Pictures\\forward_dir_right.jpg", Program.ExecutableDir, true));
diff --git a/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs
index 6262ccb5a..16bdf5118 100644
--- a/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Dummy/Balance/Component.cs b/TBF/BenchControl/Dummy/Balance/Component.cs
index e86d3cc21..6f2529df9 100644
--- a/TBF/BenchControl/Dummy/Balance/Component.cs
+++ b/TBF/BenchControl/Dummy/Balance/Component.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.GenericDevices;
 
 namespace TBF.BenchControl.Dummy.Balance
@@ -51,7 +51,7 @@ namespace TBF.BenchControl.Dummy.Balance
             return this;
         }
 
-		public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public IOperation ReadStableMassOp(ref Boxes.DoubleBox mass, int readingsCount, double maxSpread, MassMethod method)
         {
             mass.Val = 0;
             return this;
diff --git a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs
index 20b891a31..c0dae3361 100644
--- a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Dummy/RegulValve/RegulValve.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValve.cs
index 3dbbc37ff..b7bd901ff 100644
--- a/TBF/BenchControl/Dummy/RegulValve/RegulValve.cs
+++ b/TBF/BenchControl/Dummy/RegulValve/RegulValve.cs
@@ -8,7 +8,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Dummy.RegulValve
 {
-	public class RegulValve : ComponentBase, GenericDevices.IRegulValve
+	public class RegulValve : ComponentBase, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve));
         public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
diff --git a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs
index 16ee50f28..c09261166 100644
--- a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs
+++ b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs b/TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs
index d3dfc5f57..860a8efa3 100644
--- a/TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs
+++ b/TBF/BenchControl/Dummy/RegulValve/SetFlowOp.cs
@@ -47,7 +47,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
 		/// <param name="timeout">Timeout for the flow setting in [s]</param>
         /// <param name="leaveMeasurementRunning">true = Leave the measurement running after op. stop</param>
         /// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-        public SetFlowOp(IRegulValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(IRegValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox measuredFlow, int timeout, bool leaveMeasurementRunning)
         {
             this.regulValve = regulValve as RegulValve;
@@ -72,7 +72,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
         /// Set required water flow - Do not leave the measurement running.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow, int timeout)
+        public SetFlowOp(IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow, int timeout)
             : this(regValve, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, timeout, false)
         {
         }
@@ -81,7 +81,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
         /// Set required water flow - No timeout.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow)
+        public SetFlowOp(IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow)
 			: this(regValve, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, int.MaxValue, false)
         {
         }
diff --git a/TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs b/TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs
index c1cca8279..7248f80ce 100644
--- a/TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/ControlBoardCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs
index 5ef8b28f5..bdc64ca50 100644
--- a/TBF/BenchControl/Elde/ControlBoardDev.cs
+++ b/TBF/BenchControl/Elde/ControlBoardDev.cs
@@ -5,6 +5,7 @@ using System;
 using System.Text;
 using System.IO.Ports;
 using System.Collections.Generic;
+using Common;
 using Config.Entities;
 using Dirichlet.Numerics;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTest.cs b/TBF/BenchControl/Elde/CoverTest/CoverTest.cs
index 83aa98f6a..0fd7cc0ad 100644
--- a/TBF/BenchControl/Elde/CoverTest/CoverTest.cs
+++ b/TBF/BenchControl/Elde/CoverTest/CoverTest.cs
@@ -25,7 +25,7 @@ namespace TBF.BenchControl.Elde.CoverTest
         ulong mask;					    /// derived from bitPosition in the constructor
 		ulong target;
 		string message;
-        Users.Entities.GID[] bypassLevel;
+        Common.GID[] bypassLevel;
 
 
 		public CoverTest() { }
diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs
index 640092af2..d4bccaf92 100644
--- a/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs
+++ b/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs
@@ -22,7 +22,7 @@ namespace TBF.BenchControl.Elde.CoverTest
 		public int BitPosition;
 		public bool Invert;
         public string Message;
-        public Users.Entities.GID[] BypassLevel;
+        public Common.GID[] BypassLevel;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		CoverTestCfg()
@@ -35,7 +35,7 @@ namespace TBF.BenchControl.Elde.CoverTest
 			Invert = false;
             Message = Strings.Close_the_cover;
 
-            BypassLevel = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists };
+            BypassLevel = new Common.GID[] { Common.GID.TestingSpecialists };
 		}
 
         public CoverTestCfg(IComponentFactory factory)
diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs
index 2e5b32c1b..b2c9916f6 100644
--- a/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
@@ -47,7 +48,7 @@ namespace TBF.BenchControl.Elde.CoverTest
 				}
 			}
 
-            for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
+            for (Common.GID gid = 0; gid < Common.GID.NrOfGroups; gid++)
             {
                 bypassLevelComboBox.Items.Add(gid.ToString());
             }
@@ -95,11 +96,11 @@ namespace TBF.BenchControl.Elde.CoverTest
             config.Message = messageTextBox.Text;
 
             config.BypassLevel = null;
-            for (Users.Entities.GID gid = 0; gid < Users.Entities.GID.NrOfGroups; gid++)
+            for (Common.GID gid = 0; gid < Common.GID.NrOfGroups; gid++)
             {
                 if (bypassLevelComboBox.Text == gid.ToString())
                 {
-                    config.BypassLevel = new Users.Entities.GID[] { gid };
+                    config.BypassLevel = new Common.GID[] { gid };
                     break;
                 }
             }
diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs
index b2b55ee67..0bb13e6e6 100644
--- a/TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs
+++ b/TBF/BenchControl/Elde/CoverTest/CoverTestForm.cs
@@ -18,9 +18,9 @@ namespace TBF.BenchControl.Elde.CoverTest
 		public bool Completed { get { return completed; } }
 		bool completed;
 
-        Users.Entities.GID[] bypassLevel;
+        Common.GID[] bypassLevel;
 
-        public CoverTestForm(string message, Users.Entities.GID[] bypassLevel, ILog bypassLog)
+        public CoverTestForm(string message, Common.GID[] bypassLevel, ILog bypassLog)
 		{
 			InitializeComponent();
             ControlBox = false;
diff --git a/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
index a21238983..02dec5c62 100644
--- a/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs
index 13bfcfe08..5e237a056 100644
--- a/TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs
+++ b/TBF/BenchControl/Elde/FixedStartRegisterReader/RRProcedureParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs
index 1c76056d1..21c4f3191 100644
--- a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs
+++ b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.FixedStartRegisterReader
@@ -26,7 +27,7 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader
                 return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
             }
         }
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
 
diff --git a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs
index aaa2f0534..94678d466 100644
--- a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
index 9887359a6..d6ef2b931 100644
--- a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2013-2018 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Configs;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs
index debfcfd53..0a1e7b4e3 100644
--- a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Configs;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs
index 0c3fe7da3..fa290f6cc 100644
--- a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs
index e6f5e1d68..655774cea 100644
--- a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs
index 09e9cc875..99b8bcb7f 100644
--- a/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs
+++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs
@@ -39,11 +39,11 @@ namespace TBF.BenchControl.Elde.PressureMeter
 			/// Prepare data for SendCalibData() control board component method
 			ControlBoard.MeretRS485Address[Idx0] = RS485Address;
 
-            if (pressureMeterCfg.Protocol == Config.Entities.MeretProtocol.Undefined)
+            if (pressureMeterCfg.Protocol == Common.MeretProtocol.Undefined)
             {
                 throw new Exception("Metret protocol not defined");
             }
-            else if (pressureMeterCfg.Protocol == Config.Entities.MeretProtocol.Modbus)
+            else if (pressureMeterCfg.Protocol == Common.MeretProtocol.Modbus)
             {
                 ControlBoard.MeretProtocol |= (byte)(1 << Idx0);
             }
@@ -65,13 +65,13 @@ namespace TBF.BenchControl.Elde.PressureMeter
                 /// Calibration due date calendar event
                 calendarEvents.Add(new TBF.UI.Calendar.CalibrationDueDateEvent(calibrationDue.Date, Name,
                                                                                string.Format(Strings.Calibration_due_date_is_0,
-                                                                                             calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat))));
+                                                                               calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat))));
                 if (DateTime.Now.Date <= calibrationDue.AddDays(-7))
                 {
                     /// Weekly reminders (last 5 weeks)
                     calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.Date.AddDays(-35), Name,
                                                                                     string.Format(Strings.Calibration_due_date_is_0,
-                                                                                                  calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)),
+                                                                                    calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)),
                                                                                     false));
                 }
                 if (DateTime.Now.Date <= calibrationDue.Date)
@@ -79,7 +79,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
                     /// Daily reminders (last 5 days)
                     calendarEvents.Add(new TBF.UI.Calendar.CalibrationReminderEvent(calibrationDue.AddDays(-5), Name,
                                                                                     string.Format(Strings.Calibration_due_date_is_0,
-                                                                                                  calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)),
+                                                                                    calibrationDue.Date.ToString(TBF.UI.Constants.DateFormat)),
                                                                                     true));
                 }
             }
diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs
index 145e8de93..8cd197ed2 100644
--- a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs
+++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Elde.PressureMeter
diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
index 671459a9c..6b9982a17 100644
--- a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs
index 25b101d2b..4cf1d73c6 100644
--- a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs
index f6e93616e..c502ab880 100644
--- a/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs
index b388ff708..ed37111b1 100644
--- a/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs
index 0aab0fae4..6a72cc8ee 100644
--- a/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/RegulValve/RegulValve.cs b/TBF/BenchControl/Elde/RegulValve/RegulValve.cs
index a4271405d..d749451ac 100644
--- a/TBF/BenchControl/Elde/RegulValve/RegulValve.cs
+++ b/TBF/BenchControl/Elde/RegulValve/RegulValve.cs
@@ -9,7 +9,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.RegulValve
 {
-	public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegulValve
+	public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve));
         public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
diff --git a/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
index 86d693a1e..8fc12041f 100644
--- a/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs
index e9aaa2d13..1bc3845c5 100644
--- a/TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs
+++ b/TBF/BenchControl/Elde/RegulValve/SetFlowOp.cs
@@ -81,7 +81,7 @@ namespace TBF.BenchControl.Elde.RegulValve
 		/// <param name="timeout">Timeout for the flow setting in [s]</param>
         /// <param name="leaveMeasurementRunning">true = Leave the measurement running after op. stop</param>
         /// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowBox, bool reTryCmds, int timeout, bool leaveMeasurementRunning)
         {
 			if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
@@ -119,7 +119,7 @@ namespace TBF.BenchControl.Elde.RegulValve
         /// Set required water flow - Do not leave the measurement running.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowbox, bool reTryCmds, int timeout)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, flowbox, reTryCmds, timeout, false)
         {
@@ -129,7 +129,7 @@ namespace TBF.BenchControl.Elde.RegulValve
         /// Set required water flow - No timeout.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowbox, bool reTryCmds)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, flowbox, reTryCmds, int.MaxValue, false)
         {
diff --git a/TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs
index c0ba9c122..3cebc6485 100644
--- a/TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs
+++ b/TBF/BenchControl/Elde/RegulValveCoax/RegulValve.cs
@@ -8,7 +8,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.RegulValveCoax
 {
-	public class RegulValve : ComponentBase, GenericDevices.IRegulValve
+	public class RegulValve : ComponentBase, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve));
         public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
diff --git a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs
index 30ac9e536..5cfc21971 100644
--- a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs
index aa4697be5..7662f0e94 100644
--- a/TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs
+++ b/TBF/BenchControl/Elde/RegulValveCoax/SetFlowOp.cs
@@ -76,7 +76,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
 		/// <param name="timeout">Timeout for the flow setting in [s]</param>
         /// <param name="leaveMeasurementRunning">true = Leave the measurement running after op. stop</param>
         /// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve _regulValve, IFlowMeter flowMeter,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve _regulValve, IFlowMeter flowMeter,
                          double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow,
                          bool reTryCmds, int timeout, bool leaveMeasurementRunning)
         {
@@ -120,7 +120,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
         /// Set required water flow - Do not leave the measurement running.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox measuredFlow, bool reTryCmds, int timeout)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, reTryCmds, timeout, false)
         {
@@ -130,7 +130,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
         /// Set required water flow - No timeout.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox measuredFlow, bool reTryCmds)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, reTryCmds, int.MaxValue, false)
         {
diff --git a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValve.cs b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValve.cs
index 0bceebe8e..033be6be8 100644
--- a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValve.cs
+++ b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValve.cs
@@ -9,7 +9,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.RegulValveMilwaukee
 {
-	public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegulValve
+	public class RegulValve : ComponentBase, IDevice, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegulValve));
         public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
diff --git a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs
index 9ad646289..f06f584a0 100644
--- a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/RegulValveMilwaukee/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValveMilwaukee/SetFlowOp.cs
index 5ec2acc7d..c277c381a 100644
--- a/TBF/BenchControl/Elde/RegulValveMilwaukee/SetFlowOp.cs
+++ b/TBF/BenchControl/Elde/RegulValveMilwaukee/SetFlowOp.cs
@@ -77,7 +77,7 @@ namespace TBF.BenchControl.Elde.RegulValveMilwaukee
 		/// <param name="timeout">Timeout for the flow setting in [s]</param>
         /// <param name="leaveMeasurementRunning">true = Leave the measurement running after op. stop</param>
         /// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regulValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowBox, bool reTryCmds, int timeout, bool leaveMeasurementRunning)
         {
 			if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
@@ -113,7 +113,7 @@ namespace TBF.BenchControl.Elde.RegulValveMilwaukee
         /// Set required water flow - Do not leave the measurement running.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowbox, bool reTryCmds, int timeout)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, flowbox, reTryCmds, timeout, false)
         {
@@ -123,7 +123,7 @@ namespace TBF.BenchControl.Elde.RegulValveMilwaukee
         /// Set required water flow - No timeout.
         /// Events:  FlowSet
         /// </summary>
-        public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
+        public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi,
                          DoubleBox flowbox, bool reTryCmds)
             : this(controlBoard, regValve, flowMeter, requiredFlowLo, requiredFlowHi, flowbox, reTryCmds, int.MaxValue, false)
         {
diff --git a/TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs
index 954809a3b..5a83c51ae 100644
--- a/TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs
+++ b/TBF/BenchControl/Elde/RegulValveTandem/ChangeValvePositionOp.cs
@@ -32,7 +32,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
 		/// <param name="posHiPct">Upper limit of the position to be achieved</param>
 		/// <param name="timeout">Timeout in sec. for setting the flow</param>
 		/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-        public ChangeRegulValvePositionOp(ControlBoardDev controlBoard, IRegulValve _regulValve, float timePulseSec)
+        public ChangeRegulValvePositionOp(ControlBoardDev controlBoard, IRegValve _regulValve, float timePulseSec)
         {
 			if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
 			this.controlBoard = controlBoard;
diff --git a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs
index 5c352aec1..96a27ae15 100644
--- a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs
+++ b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandem.cs
@@ -9,7 +9,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.Elde.RegulValveTandem
 {
-	public class RegulValveTandem : ComponentBase, GenericDevices.IRegulValve
+	public class RegulValveTandem : ComponentBase, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegulValveTandem));
         public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
diff --git a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs
index 1c5b01c15..5c29ae1e2 100644
--- a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs
index 74e06de08..b8a20af70 100644
--- a/TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs
+++ b/TBF/BenchControl/Elde/RegulValveTandem/SetFlowOp.cs
@@ -75,7 +75,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
 		/// <param name="timeout">Timeout for the flow setting in [s]</param>
         /// <param name="leaveMeasurementRunning">true = Leave the measurement running after op. stop</param>
         /// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-		public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regV, IRegulValve fxdRV, float fxdPctLo, float fxdPctHi,
+		public SetFlowOp(ControlBoardDev controlBoard, IRegValve regV, IRegValve fxdRV, float fxdPctLo, float fxdPctHi,
                          IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow,
 						 int timeout, bool leaveMeasurementRunning)
         {
@@ -125,7 +125,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
         /// Set required water flow - Do not leave the measurement running.
         /// Events:  FlowSet
         /// </summary>
-		public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IRegulValve fixedRV, float fixedPctLo, float fixedPctHi,
+		public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IRegValve fixedRV, float fixedPctLo, float fixedPctHi,
                          IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow, int timeout)
 			: this(controlBoard, regValve, fixedRV, fixedPctLo, fixedPctHi, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, timeout, false)
         {
@@ -135,7 +135,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
         /// Set required water flow - No timeout.
         /// Events:  FlowSet
         /// </summary>
-		public SetFlowOp(ControlBoardDev controlBoard, IRegulValve regValve, IRegulValve fixedRV, float fixedPctLo, float fixedPctHi,
+		public SetFlowOp(ControlBoardDev controlBoard, IRegValve regValve, IRegValve fixedRV, float fixedPctLo, float fixedPctHi,
                          IFlowMeter flowMeter, double requiredFlowLo, double requiredFlowHi, DoubleBox measuredFlow)
             : this(controlBoard, regValve, fixedRV, fixedPctLo, fixedPctHi, flowMeter, requiredFlowLo, requiredFlowHi, measuredFlow, int.MaxValue, false)
         {
diff --git a/TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs b/TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs
index 0292c5b68..9cee47fdb 100644
--- a/TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs
+++ b/TBF/BenchControl/Elde/RegulValveTandem/SetRegulValvePositionOp.cs
@@ -39,7 +39,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
 		/// <param name="posHiPct">Upper limit of the position to be achieved</param>
 		/// <param name="timeout">Timeout in sec. for setting the flow</param>
 		/// <remarks>Only Elde.Valve flow are used, other flow on the lists are ignored</remarks>
-		public SetRegulValvePositionOp(ControlBoardDev controlBoard, IRegulValve regV, float posLoPct, float posHiPct, int timeout)
+		public SetRegulValvePositionOp(ControlBoardDev controlBoard, IRegValve regV, float posLoPct, float posHiPct, int timeout)
         {
 			if (controlBoard == null) throw new ArgumentNullException("ctrlBoard");
 			this.controlBoard = controlBoard;
diff --git a/TBF/BenchControl/Elde/StartMeasurementOp.cs b/TBF/BenchControl/Elde/StartMeasurementOp.cs
index 3c6f47d95..01a11af0e 100644
--- a/TBF/BenchControl/Elde/StartMeasurementOp.cs
+++ b/TBF/BenchControl/Elde/StartMeasurementOp.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde
 
 		/// Set by the constructor
 		readonly ControlBoardDev controlBoard;
-		readonly IRegulValve regulValve;
+		readonly IRegValve regulValve;
 		readonly int regulValveNr;
         readonly int regulValveStableTime;
 		readonly int flowMeterNr;
diff --git a/TBF/BenchControl/Elde/TempMeter/TempMeter.cs b/TBF/BenchControl/Elde/TempMeter/TempMeter.cs
index 6b41195cf..cdbe5e048 100644
--- a/TBF/BenchControl/Elde/TempMeter/TempMeter.cs
+++ b/TBF/BenchControl/Elde/TempMeter/TempMeter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 using TBF.Resources;
@@ -84,11 +85,11 @@ namespace TBF.BenchControl.Elde.TempMeter
 
         public double ReadTemperature()
         {
-			if (Cfg.DebugLevel == Config.Entities.DebugMode.Normal)
+			if (Cfg.DebugLevel == DebugMode.Normal)
 			{
 				return Config.Formulas.CorrectedValue((double)ControlBoard.Temperature(Idx0), Corrections);
 			}
-			else if (Cfg.DebugLevel == Config.Entities.DebugMode.Simulate)
+			else if (Cfg.DebugLevel == DebugMode.Simulate)
 			{
 				return tempMtrCfg.DefaultTemperature;
 			}
diff --git a/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs
index 8acd22229..691396540 100644
--- a/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs
index fd97e829c..1acb4c3d6 100644
--- a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs
index 3cc3ce3a0..2229a0ad2 100644
--- a/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs
+++ b/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs
index e661f8cdd..3e8554511 100644
--- a/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs
index 8cc764c8a..f14b28a86 100644
--- a/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs
+++ b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/FeedingPath.cs b/TBF/BenchControl/FeedingPath.cs
index 427ba89ab..672d2f1e0 100644
--- a/TBF/BenchControl/FeedingPath.cs
+++ b/TBF/BenchControl/FeedingPath.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl
         public float Qto;
         public string Selector;
         public IValve Pump;                     /// pump to use with this path or null
-        public IList<IRegulValve> RegulValves;
+        public IList<IRegValve> RegulValves;
         public IList<float> RegulValvesPct;
         public IList<IValve> ValvesOpen;        /// a list of valves to open or null
         public IList<IValve> ValvesClose;       /// a list of valves to close or null
@@ -26,7 +26,7 @@ namespace TBF.BenchControl
             Name = name;
 			ValvesOpen = new List<IValve>();
 			ValvesClose = new List<IValve>();
-            RegulValves = new List<IRegulValve>();
+            RegulValves = new List<IRegValve>();
             RegulValvesPct = new List<float>();
 		}
 
@@ -44,7 +44,7 @@ namespace TBF.BenchControl
             ///
             foreach (var cmpnt in components)
             {
-                IRegulValve regValve = cmpnt as IRegulValve;
+                IRegValve regValve = cmpnt as IRegValve;
                 if (regValve != null && regValve.Category == TBF.BenchControl.ValveCategory.Feeding)
                 {
                     RegulValves.Add(regValve);
diff --git a/TBF/BenchControl/Generic/IComponentCfg.cs b/TBF/BenchControl/Generic/IComponentCfg.cs
index 601bf132a..0ea76a5be 100644
--- a/TBF/BenchControl/Generic/IComponentCfg.cs
+++ b/TBF/BenchControl/Generic/IComponentCfg.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.Generic
diff --git a/TBF/BenchControl/Generic/IComponentCfgCtrl.cs b/TBF/BenchControl/Generic/IComponentCfgCtrl.cs
index 2d25f6071..0fbddbcc2 100644
--- a/TBF/BenchControl/Generic/IComponentCfgCtrl.cs
+++ b/TBF/BenchControl/Generic/IComponentCfgCtrl.cs
@@ -1,6 +1,7 @@
 ///
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.Generic
diff --git a/TBF/BenchControl/GenericDevices/IBenchInfo.cs b/TBF/BenchControl/GenericDevices/IBenchInfo.cs
index 182e13113..4214ce565 100644
--- a/TBF/BenchControl/GenericDevices/IBenchInfo.cs
+++ b/TBF/BenchControl/GenericDevices/IBenchInfo.cs
@@ -1,7 +1,7 @@
 ///
 /// Copyright (c) 2015-2018 Sensus Slovensko a.s.
 ///
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.GenericDevices
diff --git a/TBF/BenchControl/GenericDevices/ICamera.cs b/TBF/BenchControl/GenericDevices/ICamera.cs
index 0e79a6fd6..26fc5ed4a 100644
--- a/TBF/BenchControl/GenericDevices/ICamera.cs
+++ b/TBF/BenchControl/GenericDevices/ICamera.cs
@@ -1,8 +1,7 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
-using Config.Entities;
-using TBF.BenchControl;
+using Common;
 
 namespace TBF.BenchControl.GenericDevices
 {
diff --git a/TBF/BenchControl/GenericDevices/IRegReader.cs b/TBF/BenchControl/GenericDevices/IRegReader.cs
index a3810deaf..b44ec5a13 100644
--- a/TBF/BenchControl/GenericDevices/IRegReader.cs
+++ b/TBF/BenchControl/GenericDevices/IRegReader.cs
@@ -1,6 +1,7 @@
 ///
 /// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
@@ -8,7 +9,7 @@ namespace TBF.BenchControl.GenericDevices
 {
 	public interface IRegReader : IComponent
 	{
-        Config.Entities.RegisterReaderType RegisterReaderType { get; }
+        RegisterReaderType RegisterReaderType { get; }
 
         int Position { get; }
 		double PulsesPerLtr { get; }	/// [imp/l] ... water meter or volume measurement part of a heat meter
diff --git a/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs b/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs
index e99cfa3cb..2c68a7905 100644
--- a/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs
+++ b/TBF/BenchControl/GenericDevices/IRegReaderStillCamera.cs
@@ -1,6 +1,7 @@
 ///
 /// Copyright (c) 2017-2020 Sensus Slovensko a.s.
 ///
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.GenericDevices
@@ -22,6 +23,6 @@ namespace TBF.BenchControl.GenericDevices
 		IOperation GrabImageOp(string imageFileName,
 							   bool blackAndWhite,
 							   bool lowResolution,
-							   Config.Entities.ImageRotation imageRotation);
+							   ImageRotation imageRotation);
 	}
 }
diff --git a/TBF/BenchControl/GenericDevices/IRegulValve.cs b/TBF/BenchControl/GenericDevices/IRegValve.cs
similarity index 98%
rename from TBF/BenchControl/GenericDevices/IRegulValve.cs
rename to TBF/BenchControl/GenericDevices/IRegValve.cs
index 7f7b404ce..8486b1de5 100644
--- a/TBF/BenchControl/GenericDevices/IRegulValve.cs
+++ b/TBF/BenchControl/GenericDevices/IRegValve.cs
@@ -8,7 +8,7 @@ using TBF.Boxes;
 
 namespace TBF.BenchControl.GenericDevices
 {
-	public interface IRegulValve : IComponent
+	public interface IRegValve : IComponent
 	{
         /// <summary>
         /// All, Feeding, Bench, Output or None
diff --git a/TBF/BenchControl/GenericDevices/IScale.cs b/TBF/BenchControl/GenericDevices/IScale.cs
index bd5c87d87..8686f87ed 100644
--- a/TBF/BenchControl/GenericDevices/IScale.cs
+++ b/TBF/BenchControl/GenericDevices/IScale.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2013-2020 Sensus Slovensko a.s.
 ///
 using TBF.Boxes;
+using Common;
 
 namespace TBF.BenchControl.GenericDevices
 {
@@ -35,7 +36,7 @@ namespace TBF.BenchControl.GenericDevices
         /// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
         /// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
 		/// <returns>ReadMassAverageOp instance reference casted to IOperaton</returns>
-		IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method);
+		IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, MassMethod method);
 
         /// <summary>
         /// Events:  Done, Error
diff --git a/TBF/BenchControl/GenericDevices/ITestMethod.cs b/TBF/BenchControl/GenericDevices/ITestMethod.cs
index e99556bf9..244e6eab4 100644
--- a/TBF/BenchControl/GenericDevices/ITestMethod.cs
+++ b/TBF/BenchControl/GenericDevices/ITestMethod.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System.Collections.Generic;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/GenericDevices/IWaterMeter.cs b/TBF/BenchControl/GenericDevices/IWaterMeter.cs
index df515a1fe..978cb5398 100644
--- a/TBF/BenchControl/GenericDevices/IWaterMeter.cs
+++ b/TBF/BenchControl/GenericDevices/IWaterMeter.cs
@@ -2,7 +2,7 @@
 /// Copyright (c) 2013-2016 Sensus Metering Systems
 ///
 using TBF.BenchControl.Generic;
-using Config.Entities;
+using Common;
 
 namespace TBF.BenchControl.GenericDevices
 {
diff --git a/TBF/BenchControl/Hart/Common/Hart.cs b/TBF/BenchControl/Hart/Common/Hart.cs
index f1b91082a..d1ce9402e 100644
--- a/TBF/BenchControl/Hart/Common/Hart.cs
+++ b/TBF/BenchControl/Hart/Common/Hart.cs
@@ -8,7 +8,7 @@ using System.Globalization;
 using System.IO.Ports;
 using System.Text;
 using System.Threading;
-using Config.Entities;
+using Common;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
diff --git a/TBF/BenchControl/Hart/Common/HartCfg.cs b/TBF/BenchControl/Hart/Common/HartCfg.cs
index c55cf752e..82b9a886a 100644
--- a/TBF/BenchControl/Hart/Common/HartCfg.cs
+++ b/TBF/BenchControl/Hart/Common/HartCfg.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Hart/Nivotrack/Nivotrack.cs b/TBF/BenchControl/Hart/Nivotrack/Nivotrack.cs
index d13d8aad7..026f35baf 100644
--- a/TBF/BenchControl/Hart/Nivotrack/Nivotrack.cs
+++ b/TBF/BenchControl/Hart/Nivotrack/Nivotrack.cs
@@ -3,7 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
-using Config.Entities;
+using Common;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
diff --git a/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs b/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs
index 0e4f919d4..2fb4dde71 100644
--- a/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs
+++ b/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.IO.Ports;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs
index b2bc9be1a..b3e8e2af1 100644
--- a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs
+++ b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/Multimeter.cs
@@ -8,6 +8,7 @@ using System.IO.Ports;
 using System.Text;
 using System.Threading;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
diff --git a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
index cee2a8134..d069d346a 100644
--- a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
+++ b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs
index 8a27319f0..55cc1840b 100644
--- a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs
index 1503dda33..3dd6c965c 100644
--- a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs
+++ b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs
index 73d498f75..cfdcaecc3 100644
--- a/TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs
+++ b/TBF/BenchControl/MettlerToledo/Multi/BalanceDev.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.Text;
 using System.IO.Ports;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
@@ -335,7 +336,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
         /// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
         /// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
         /// <returns>ReadMassAverageOp instance reference casted to IOperaton</returns>
-		public IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, MassMethod method)
 		{
             return new ReadStableMassOp(this, ref mass, readingsCount, maxSpread, method);
 		}
diff --git a/TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs b/TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs
index dab06befb..7f2d0a738 100644
--- a/TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs
+++ b/TBF/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using log4net;
+using Common;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.MettlerToledo.Multi
@@ -23,7 +24,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
 		BalanceDev balanceDev;
 		int totalReadingsCount;
         double maxSpread;					/// Maximum spread of measurements in kg (otherwise the measurement continues)
-		Config.Entities.MassMethod method;  /// false = slow (precise), true = fast (immediate)
+		MassMethod method;  /// false = slow (precise), true = fast (immediate)
 		DoubleBox result;
 
 		bool started;
@@ -36,7 +37,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
 		/// <param name="readingsCount">Required mass readings count (>= 3)</param>
         /// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
         /// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
-		public ReadStableMassOp(BalanceDev balanceDev, ref DoubleBox result, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public ReadStableMassOp(BalanceDev balanceDev, ref DoubleBox result, int readingsCount, double maxSpread, MassMethod method)
         {
 			if (balanceDev == null) throw new ArgumentNullException("balanceDev");
 			this.balanceDev = balanceDev;
diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
index 0686a0c9b..1f9a99269 100644
--- a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
+++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs
index 523e8324c..62fe8f5b9 100644
--- a/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs
+++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceDev.cs
@@ -7,7 +7,7 @@ using System.Globalization;
 using System.Text;
 using System.IO.Ports;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
 using TBF.Boxes;
@@ -602,7 +602,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
         /// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
         /// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
         /// <returns>ReadMassAverageOp instance reference casted to IOperaton</returns>
-		public IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public IOperation ReadStableMassOp(ref DoubleBox mass, int readingsCount, double maxSpread, MassMethod method)
         {
 			return new ReadStableMassOp(this, ref mass, readingsCount, maxSpread, method);
 		}
diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
index 137d3705c..726a1e313 100644
--- a/TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
+++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs
index 354be4233..deddaad9a 100644
--- a/TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs
+++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceOld.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.Text;
 using System.IO.Ports;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs b/TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
index 1df92b710..11ff486ce 100644
--- a/TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
+++ b/TBF/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using log4net;
+using Common;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.MettlerToledo.Standard
@@ -19,7 +20,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 		BalanceDev scale;
 		int totalReadingsCount;
         double maxSpread;					/// Maximum spread of measurements in kg (otherwise the measurement continues)
-		Config.Entities.MassMethod method;  /// by the scale, mass spread threshold or mass standard deviation threshold
+		MassMethod method;  /// by the scale, mass spread threshold or mass standard deviation threshold
 		DoubleBox result;
 
 		/// Operation specific
@@ -39,7 +40,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 		/// <param name="readingsCount">Required mass readings count (>= 4)</param>
         /// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
         /// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
-		public ReadStableMassOp(BalanceDev scale, ref DoubleBox result, int readingsCount, double maxSpread, Config.Entities.MassMethod method)
+		public ReadStableMassOp(BalanceDev scale, ref DoubleBox result, int readingsCount, double maxSpread, MassMethod method)
         {
 			if (scale == null) throw new ArgumentNullException("balanceDev");
 			this.scale = scale;
@@ -54,7 +55,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
             currentReadingsCount = 0;
             activityStarted = false;
             measurementCompleted = false;
-            timeout = (method == Config.Entities.MassMethod.Scale) ? 60 : 2;
+            timeout = (method == MassMethod.Scale) ? 60 : 2;
 
 			log.Debug(this.ToString());
         }
@@ -64,7 +65,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
         /// </summary>
         void StartMeasurement()
         {
-            if (method == Config.Entities.MassMethod.Scale)
+            if (method == MassMethod.Scale)
                 scale.SendStableMeasurementCmd();
             else
                 scale.SendImmediateMeasurementCmd();
@@ -142,7 +143,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
                 Array.Sort(sortedMassReadings);
 
 #if STABLE_MASS_EXTRAS
-				if (method == Config.Entities.MassMethod.Spread)
+				if (method == MassMethod.Spread)
 				{
 					/// Immediate mass measurement, end condition calculated below
 
@@ -157,7 +158,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
 						return Event.BalanceDone;       /// Mass has just been calculated
 					}
 				}
-				else if (method == Config.Entities.MassMethod.StdDev)
+				else if (method == MassMethod.StdDev)
 				{
 					/// Immediate mass measurement, end condition calculated below
 
diff --git a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs
index 87078c5f5..d6f463564 100644
--- a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/Common/Modbus.cs b/TBF/BenchControl/Modbus/Common/Modbus.cs
index 032f18409..2980b0e08 100644
--- a/TBF/BenchControl/Modbus/Common/Modbus.cs
+++ b/TBF/BenchControl/Modbus/Common/Modbus.cs
@@ -8,7 +8,7 @@ using System.Globalization;
 using System.IO.Ports;
 using System.Text;
 using System.Threading;
-using Config.Entities;
+using Common;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
diff --git a/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs b/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs
index 6bed69fdd..c1b469b5f 100644
--- a/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/Common/ModbusCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Modbus/Easytherm/Easytherm.cs b/TBF/BenchControl/Modbus/Easytherm/Easytherm.cs
index 554716869..6897bb640 100644
--- a/TBF/BenchControl/Modbus/Easytherm/Easytherm.cs
+++ b/TBF/BenchControl/Modbus/Easytherm/Easytherm.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 using Config.Entities;
diff --git a/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs
index d290c894d..9f1c7e8a1 100644
--- a/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/Easytherm/ProcParams.cs b/TBF/BenchControl/Modbus/Easytherm/ProcParams.cs
index a277a59b8..dd1cfc3bb 100644
--- a/TBF/BenchControl/Modbus/Easytherm/ProcParams.cs
+++ b/TBF/BenchControl/Modbus/Easytherm/ProcParams.cs
@@ -3,6 +3,7 @@
 ///
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Modbus/Novus/Novus.cs b/TBF/BenchControl/Modbus/Novus/Novus.cs
index 2b8af7dc3..018cec8a8 100644
--- a/TBF/BenchControl/Modbus/Novus/Novus.cs
+++ b/TBF/BenchControl/Modbus/Novus/Novus.cs
@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
-using Config.Entities;
 
 namespace TBF.BenchControl.Modbus.Novus
 {
diff --git a/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs b/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs
index c92ddb3f3..a256f2736 100644
--- a/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/Novus/ProcParams.cs b/TBF/BenchControl/Modbus/Novus/ProcParams.cs
index a1d038365..d1a82a5b5 100644
--- a/TBF/BenchControl/Modbus/Novus/ProcParams.cs
+++ b/TBF/BenchControl/Modbus/Novus/ProcParams.cs
@@ -3,6 +3,7 @@
 ///
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs
index 72949639a..fe1ef05e4 100644
--- a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs
+++ b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
@@ -76,8 +77,8 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if (pressureMtrCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                pressureMtrCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (pressureMtrCfg.DebugLevel == DebugMode.Simulate ||
+                pressureMtrCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 return;
             }
@@ -105,8 +106,8 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
         /// <summary>Run this device</summary>
         public void RunDeviceAfter()
         {
-            if (pressureMtrCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                pressureMtrCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (pressureMtrCfg.DebugLevel == DebugMode.Simulate ||
+                pressureMtrCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 return;
             }
diff --git a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs
index 0f28d5c9a..c8ed82e4d 100644
--- a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs
index eba5e8b9e..f45da168a 100644
--- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs
+++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
@@ -53,7 +54,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if (quidoRSCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return;
+            if (quidoRSCfg.DebugLevel == DebugMode.Simulate) return;
 
             lock (this)
             {
diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs
index 8926dde94..66713c993 100644
--- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs
index 1e3b678e7..d9c8be84a 100644
--- a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs
+++ b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeter.cs b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeter.cs
index d3c055b43..f0a94ad84 100644
--- a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeter.cs
+++ b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeter.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
-using Config.Entities;
+using Common;
 using System.Diagnostics;
 
 namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
@@ -75,8 +75,8 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 msrmntTimeStamp = StateMachine.Time;
                 return;
@@ -113,8 +113,8 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
 
         public void RunDeviceAfter()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 return;
             }
diff --git a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
index 498228679..e6a96c092 100644
--- a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
+++ b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer/Analyzer.cs b/TBF/BenchControl/Modbus/WaterAnalyzer/Analyzer.cs
index ea686023a..9c6904481 100644
--- a/TBF/BenchControl/Modbus/WaterAnalyzer/Analyzer.cs
+++ b/TBF/BenchControl/Modbus/WaterAnalyzer/Analyzer.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
+using Common;
 using Config.Entities;
 using System.Diagnostics;
 
@@ -67,8 +68,8 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 msrmntTimeStamp = StateMachine.Time;
                 return;
@@ -96,8 +97,8 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
 
         public void RunDeviceAfter()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 return;
             }
diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs b/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs
index c6129810e..a9fc5cc1b 100644
--- a/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs
+++ b/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer2/Analyzer.cs b/TBF/BenchControl/Modbus/WaterAnalyzer2/Analyzer.cs
index f0803a8b9..d723a4546 100644
--- a/TBF/BenchControl/Modbus/WaterAnalyzer2/Analyzer.cs
+++ b/TBF/BenchControl/Modbus/WaterAnalyzer2/Analyzer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
-using Config.Entities;
+using Common;
 using System.Diagnostics;
 
 namespace TBF.BenchControl.Modbus.WaterAnalyzer2
@@ -73,8 +73,8 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer2
         /// <summary>Run this device</summary>
         public void RunDeviceBefore()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 msrmntTimeStamp = StateMachine.Time;
                 return;
@@ -103,8 +103,8 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer2
         /// <summary>Run this device</summary>
         public void RunDeviceAfter()
         {
-            if (myCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                myCfg.DebugLevel == Config.Entities.DebugMode.FailureDuringOperation)
+            if (myCfg.DebugLevel == DebugMode.Simulate ||
+                myCfg.DebugLevel == DebugMode.FailureDuringOperation)
             {
                 return;
             }
diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs b/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs
index 66a9be021..9bb07a0c0 100644
--- a/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs
+++ b/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs b/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs
index e58f667d6..b8edfa52d 100644
--- a/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Adapter/NetadapterCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs b/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
index 0d372b4de..f112caffb 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/Camera.cs
@@ -14,6 +14,7 @@ using System.Threading;
 using System.Timers;
 using log4net;
 using Renci.SshNet;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Network.Telnet;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs
index 700d67380..47ee9fc65 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
 
@@ -52,7 +53,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 			HardwareAddress = 1;
 			TestImagesMode = TestImagesMode.None;
 			TestImagesCount = 3000;
-            DebugLevel = Config.Entities.DebugMode.AutoDetect;
+            DebugLevel = DebugMode.AutoDetect;
         }
 
 		public string ToString(int i)
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs
index 473f14628..a0f93cacd 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs b/TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs
index 4c39f8b47..ed6bd12f5 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/GrabImagesOp.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Diagnostics;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Network.Telnet;
 using System.IO;
 
@@ -78,7 +78,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
                 ///
                 File.Delete(imgFileNames[0]);
 
-                if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate || camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.DetectedOff)
+                if (camera.CameraCfg.DebugLevel == DebugMode.Simulate || camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
                 {
                     ///
                     /// Camera is in simulation mode => create a simulated image
@@ -97,8 +97,8 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
                 ///
                 return Event.GrabPassed;
 			}
-            else if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate ||
-                     camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.DetectedOff)
+            else if (camera.CameraCfg.DebugLevel == DebugMode.Simulate ||
+                     camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
             {
                 ///
                 /// Camera is in simulation mode => create a simulated image and complete
@@ -211,7 +211,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 
 		public void Stop()
 		{
-			if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return;
+			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
 
 			if (grabImageCommandSent)
 			{
diff --git a/TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs b/TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs
index 0b23ae85d..f0dbc45c6 100644
--- a/TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs
+++ b/TBF/BenchControl/Network/Camera/CLP1611/LiveStreamOp.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using log4net;
+using Common;
 using TBF.BenchControl.Network.Telnet;
 
 namespace TBF.BenchControl.Network.Camera.CLP1611
@@ -34,7 +35,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 
 		public Event Run()
 		{
-			if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return Event.None;
+			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return Event.None;
 
 			log.DebugFormat("Run(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
 
@@ -53,7 +54,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
 
 		public void Stop()
 		{
-			if (camera.CameraCfg.DebugLevel == Config.Entities.DebugMode.Simulate) return;
+			if (camera.CameraCfg.DebugLevel == DebugMode.Simulate) return;
 
 			log.DebugFormat("Stop(): telnet.State = {0}, liveStreamCommandSent = {1}", telnet.State, liveStreamCommandSent);
             
diff --git a/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs
index b568132b4..4cc538b74 100644
--- a/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs b/TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs
index aa70a78a1..e86fb0fd5 100644
--- a/TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs
+++ b/TBF/BenchControl/Network/Camera/Roi/ProcedureParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Network/Camera/Roi/Roi.cs b/TBF/BenchControl/Network/Camera/Roi/Roi.cs
index 6171f1f6f..2d1435107 100644
--- a/TBF/BenchControl/Network/Camera/Roi/Roi.cs
+++ b/TBF/BenchControl/Network/Camera/Roi/Roi.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using log4net;
-using Config.Entities;
+using Common;
 
 namespace TBF.BenchControl.Network.Camera.Roi
 {
@@ -34,7 +34,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
                 return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
             }
         }
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Camera; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Camera; } }
         public double PulsesPerLtr { get { return RoiCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
 
diff --git a/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs
index 9d42448f6..4fa734bf8 100644
--- a/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs
+++ b/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs
index 5048b0802..b4017d5c6 100644
--- a/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs
index 47dc5c519..d742540de 100644
--- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs
+++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/ProcedureParams.cs
@@ -3,6 +3,7 @@
 ///
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs
index 46c78fcb9..35a5fee83 100644
--- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs
+++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/Roi.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
-using Config.Entities;
+using Common;
 
 namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
 {
@@ -31,7 +31,7 @@ namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
                 return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
             }
         }
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return roiCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
 
@@ -130,7 +130,7 @@ namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
 		}
 
 		public IOperation GrabImageOp(string imageFileName,
-                                      bool blackAndWhite, bool lowResolution, Config.Entities.ImageRotation imageRotation)
+                                      bool blackAndWhite, bool lowResolution, ImageRotation imageRotation)
 		{
 			if (NetCamera != null)
 			{
diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs
index 32f6c70be..752dafe09 100644
--- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs
+++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs
@@ -1,8 +1,9 @@
 ///
-/// Copyright (c) 2017 Sensus Metering Systems
+/// Copyright (c) 2017 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs
index 5b08f38d4..c85817c4c 100644
--- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Network/Comet/Ambient/Ambient.cs b/TBF/BenchControl/Network/Comet/Ambient/Ambient.cs
index c80b73256..cf96360d2 100644
--- a/TBF/BenchControl/Network/Comet/Ambient/Ambient.cs
+++ b/TBF/BenchControl/Network/Comet/Ambient/Ambient.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
 
diff --git a/TBF/BenchControl/Network/Comet/Ambient/AmbientCfgCtrl.cs b/TBF/BenchControl/Network/Comet/Ambient/AmbientCfgCtrl.cs
index 6b8a1fef1..5dfff8020 100644
--- a/TBF/BenchControl/Network/Comet/Ambient/AmbientCfgCtrl.cs
+++ b/TBF/BenchControl/Network/Comet/Ambient/AmbientCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Net;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Operations/SetAllRegulValvesOp.cs b/TBF/BenchControl/Operations/SetAllRegulValvesOp.cs
index 42e2556a5..e645079f7 100644
--- a/TBF/BenchControl/Operations/SetAllRegulValvesOp.cs
+++ b/TBF/BenchControl/Operations/SetAllRegulValvesOp.cs
@@ -16,7 +16,7 @@ namespace TBF.BenchControl.Operations
         int rvCount;
         IOperation[] setRVPosOps;
 
-        public SetAllRegulValvesOp(IList<IRegulValve> regulValves, IList<float> positions, int timeout)
+        public SetAllRegulValvesOp(IList<IRegValve> regulValves, IList<float> positions, int timeout)
         {
             if (regulValves == null || regulValves.Count == 0)
             {
diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs b/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs
index 4b636177f..c2837342f 100644
--- a/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs
+++ b/TBF/BenchControl/Output/DB/ProductionTracing/Tracing.cs
@@ -8,6 +8,7 @@ using System.Net;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using Common;
 using Config.Entities;
 using TracingDB.Entities;
 using Events.Entities;
diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.cs b/TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.cs
index eb3728acf..e8be106da 100644
--- a/TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.cs
+++ b/TBF/BenchControl/Output/DB/ProductionTracing/TracingCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using System.Collections.Generic;
diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
index 2eb122914..30c9540ae 100644
--- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
+++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorr.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using Common;
 using Config;
 using Config.Entities;
 using TracingDB.Entities;
@@ -199,7 +200,7 @@ namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections
                     ITransaction transaction = null;
                     try
                     {
-                        ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                        ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                         transaction = session.BeginTransaction();
 
                         for (int div = 1; div <= myCfg.DivertersCount(); div++)
diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs
index a739a1815..4223ae228 100644
--- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs
+++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2019 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
index 100734984..7eb498332 100644
--- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
+++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorr.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using log4net;
 using NHibernate;
 using NHibernate.Criterion;
+using Common;
 using Config;
 using Config.Entities;
 using TracingDB.Entities;
@@ -206,7 +207,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections
                     ITransaction transaction = null;
                     try
                     {
-                        ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                        ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                         transaction = session.BeginTransaction();
 
                         for (int fmtr = 1; fmtr <= myCfg.FlowmetersCount(); fmtr++)
diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs
index 2842cdfe9..91fbcbea9 100644
--- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs
+++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2018 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
index a5e1cb1bc..9bb10aedb 100644
--- a/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+++ b/TBF/BenchControl/Output/DB/SensusOracle/Database.cs
@@ -10,6 +10,7 @@ using Oracle.ManagedDataAccess.Client;
 #else
 using Oracle.DataAccess.Client;
 #endif
+using Common;
 using Config;
 using Config.Entities;
 using Results.Output;
diff --git a/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs b/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs
index 67bc064ec..7b302553f 100644
--- a/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs
+++ b/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Output/DB/SensusOracle/ProcedureParams.cs b/TBF/BenchControl/Output/DB/SensusOracle/ProcedureParams.cs
index 865fe3b82..e27b9daae 100644
--- a/TBF/BenchControl/Output/DB/SensusOracle/ProcedureParams.cs
+++ b/TBF/BenchControl/Output/DB/SensusOracle/ProcedureParams.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Text;
 using System.Xml.Serialization;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Output;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs b/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs
index 5f8cd53bc..ccc989b5c 100644
--- a/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs
+++ b/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/EventTriggers/Standard/Trigger.cs b/TBF/BenchControl/Output/EventTriggers/Standard/Trigger.cs
index 63accf31e..602c002b5 100644
--- a/TBF/BenchControl/Output/EventTriggers/Standard/Trigger.cs
+++ b/TBF/BenchControl/Output/EventTriggers/Standard/Trigger.cs
@@ -4,6 +4,7 @@
 using System;
 using log4net;
 using NHibernate;
+using Common;
 using Events.Entities;
 
 namespace TBF.BenchControl.Output.EventTriggers.Standard
diff --git a/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs b/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs
index 89a47f9d0..2bead8acf 100644
--- a/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs
+++ b/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs
index dc363455a..079d866f3 100644
--- a/TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/FileWriters/Basic/FactoryCompound.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Basic
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Basic
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.Compound", this, Config.Entities.MetersKind.Combined); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.Compound", this, Common.MetersKind.Combined); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Combined;
+            (cfg as WriterCfg).MetersKind = MetersKind.Combined;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs
index 71a8d542a..348be8bd8 100644
--- a/TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/FileWriters/Basic/FactoryHeatMeters.cs
@@ -15,12 +15,12 @@ namespace TBF.BenchControl.Output.FileWriters.Basic
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.HeatMeters", this, Common.MetersKind.HeatMeter); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.HeatMeter;
+            (cfg as WriterCfg).MetersKind = Common.MetersKind.HeatMeter;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs
index 68c556ee2..43a8c6a50 100644
--- a/TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs
+++ b/TBF/BenchControl/Output/FileWriters/Basic/FactorySingle.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Basic
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Basic
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.Single", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Basic.Single", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs
index a805a32f2..9b716bc82 100644
--- a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Basic
@@ -31,14 +32,14 @@ namespace TBF.BenchControl.Output.FileWriters.Basic
         public string Footer;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
 		{
 		}
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs
index ac3bf9549..f96041ca1 100644
--- a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/Elde/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Elde/FactorySingle.cs
index f64307a60..1878537bf 100644
--- a/TBF/BenchControl/Output/FileWriters/Elde/FactorySingle.cs
+++ b/TBF/BenchControl/Output/FileWriters/Elde/FactorySingle.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Elde
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Elde", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Elde", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Elde/Writer.cs b/TBF/BenchControl/Output/FileWriters/Elde/Writer.cs
index a8aeb519a..88654d632 100644
--- a/TBF/BenchControl/Output/FileWriters/Elde/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/Elde/Writer.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using log4net;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.Output.FileWriters.Elde
@@ -356,7 +357,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
             int[] widths = new int[] { 11, 5, 6, 9, 12, 12, 8, 11, 10, 15, 8, 1 };     /// Widths of columns
             foreach (var testRslt in batch.RegularTestRslts())
             {
-                if (testRslt.Publish() == Config.Entities.Publish.Always)
+                if (testRslt.Publish() == Publish.Always)
                 {
                     for (int i = 0; i < Math.Min(testItems.Count, widths.Length); i++)
                     {
@@ -382,7 +383,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
             {
                 foreach (var testRslt in batch.RegularTestRslts())
                 {
-                    if (testRslt.Publish() == Config.Entities.Publish.Always)
+                    if (testRslt.Publish() == Publish.Always)
                     {
                         wrtr.Write(toPrint = testRslt.Name());
                         for (int j = 0; j < Math.Max(1, (i<2 ? 8 : 7) - toPrint.Length); j++) wrtr.Write(' ');
@@ -409,7 +410,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
                     /// Volume start
                     foreach (var mtr in wm.RegularMeterTestRslts())
                     {
-                        if (mtr.Publish() == Config.Entities.Publish.Always)
+                        if (mtr.Publish() == Publish.Always)
                         {
                             wrtr.Write(toPrint = mtr.VolumeStart.ToString("F2"));
                             for (int j = 0; j < Math.Max(1, 8 - toPrint.Length); j++) wrtr.Write(' ');
@@ -420,7 +421,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
                     /// Volume end
                     foreach (var mtr in wm.RegularMeterTestRslts())
                     {
-                        if (mtr.Publish() == Config.Entities.Publish.Always)
+                        if (mtr.Publish() == Publish.Always)
                         {
                             wrtr.Write(toPrint = mtr.VolumeEnd.ToString("F2"));
                             for (int j = 0; j < Math.Max(1, 8 - toPrint.Length); j++) wrtr.Write(' ');
@@ -431,7 +432,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
                     /// Error
                     foreach (var mtr in wm.RegularMeterTestRslts())
                     {
-                        if (mtr.Publish() == Config.Entities.Publish.Always)
+                        if (mtr.Publish() == Publish.Always)
                         {
                             wrtr.Write(toPrint = mtr.Error.ToString("F2"));
                             for (int j = 0; j < Math.Max(1, 7 - toPrint.Length); j++) wrtr.Write(' ');
diff --git a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs
index 35172c9e5..97deca180 100644
--- a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Elde
@@ -30,14 +31,14 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
         public string Footer;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
 		{
 		}
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfgCtrl.cs
index a8ea848f0..29eb26bba 100644
--- a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs
index bdd471a3f..a527310c2 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryCompound.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Enhanced
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.Compound", this, Config.Entities.MetersKind.Combined); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.Compound", this, MetersKind.Combined); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Combined;
+            (cfg as WriterCfg).MetersKind = MetersKind.Combined;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs
index ffc28d3ea..80f8b0826 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/FactoryHeatMeters.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Enhanced
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.HeatMeters", this, MetersKind.HeatMeter); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.HeatMeter;
+            (cfg as WriterCfg).MetersKind = MetersKind.HeatMeter;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs
index 79e6ea3af..4a699aa62 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/FactorySingle.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Enhanced
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.Single", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Enhanced.Single", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs
index 9d0584146..ed2b7041a 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/Writer.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using log4net;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.Output.FileWriters.Enhanced
@@ -362,7 +363,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
                 columnWidths[i] = ElSpaces(testItems[i].Caption).Length;
 				foreach (var mtr in wm.RegularMeterTestRslts())
 				{
-					if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
+					if ((mtr != null) && (mtr.Publish() == Publish.Always))
 					{
 						string itemText = testItems[i].Print(wm, mtr.Name());
 
@@ -419,7 +420,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
 			{
                 if (abort) return;
 
-				if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+				if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
 				{
                     Results.WMeterRsltItemSpec.TableRowNr = ++rowsCount;
 
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs
index 72d661a03..8c36891fb 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Enhanced
@@ -31,7 +32,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
         public string Footer;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
@@ -39,7 +40,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
             SubtitleFormat = "{4} {0},  {5} {1}";
         }
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs
index c23fbf99c..499f04852 100644
--- a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs
index dbad7f5f9..7b5416378 100644
--- a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.ImageArchiver
@@ -25,14 +26,14 @@ namespace TBF.BenchControl.Output.FileWriters.ImageArchiver
 		public bool SaveGoodOnly;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		ArchiverCfg()
 		{
 		}
 
-        public ArchiverCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public ArchiverCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs
index f5f4d6b98..d22322479 100644
--- a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs
index ae41aad57..1d0c27ebd 100644
--- a/TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs
+++ b/TBF/BenchControl/Output/FileWriters/ImageArchiver/Factory.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.ImageArchiver
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.ImageArchiver
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Archiver(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new ArchiverCfg("FileWriter.ImageArchiver", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new ArchiverCfg("FileWriter.ImageArchiver", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(ArchiverCfg.Serializer, component, this);
-            (cfg as ArchiverCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as ArchiverCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
index 8f0dce7b0..13fc4867c 100644
--- a/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/Writer.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using log4net;
+using Common;
 using Config;
 using Config.Entities;
 using Results.Output;
diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs
index a85f3c199..e731478c0 100644
--- a/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs
index 39d4f6a0f..e4b788a4d 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryCompound.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.Compound", this, Config.Entities.MetersKind.Combined); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.Compound", this, MetersKind.Combined); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Combined;
+            (cfg as WriterCfg).MetersKind = MetersKind.Combined;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs
index 8a978bba8..36fee2871 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactoryHeatMeters.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+		public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.HeatMeters", this, MetersKind.HeatMeter); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.HeatMeter;
+            (cfg as WriterCfg).MetersKind = MetersKind.HeatMeter;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs
index 789de93d9..befd10a47 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/FactorySingle.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.Single", this, Config.Entities.MetersKind.Single); }
+		public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.OneFilePerMeter.Single", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs
index e28fb5d5e..3cc335ffe 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/Writer.cs
@@ -7,6 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using log4net;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
@@ -353,7 +354,7 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
                 columnWidths[i] = ElSpaces(testItems[i].Caption).Length;
 				foreach (var mtr in wm.RegularMeterTestRslts())
 				{
-					if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
+					if ((mtr != null) && (mtr.Publish() == Publish.Always))
 					{
 						string itemText = testItems[i].Print(wm, mtr.Name());
 
@@ -399,7 +400,7 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
 			/// Write table data
             foreach (var mtr in wm.RegularMeterTestRslts())
 			{
-				if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Config.Entities.Publish.Always)
+				if (mtr != null && mtr.IsPilotRslt() && mtr.Publish() == Publish.Always)
 				{
 					for (int i = 0; i < testItems.Count; i++)
 					{
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs
index 641008712..57b51000b 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
@@ -29,14 +30,14 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter
         public string Footer;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
 		{
 		}
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs
index 5cd614a2c..fd0b0318e 100644
--- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs
index b3a2a022b..3e2a2933f 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/FactoryCompound.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Xml
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Xml
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.Compound", this, Config.Entities.MetersKind.Combined); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.Compound", this, Common.MetersKind.Combined); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Combined;
+            (cfg as WriterCfg).MetersKind = MetersKind.Combined;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs
index 31f6ce906..911119cae 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/FactoryHeatMeters.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Xml
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Xml
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.HeatMeters", this, MetersKind.HeatMeter); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.HeatMeter;
+            (cfg as WriterCfg).MetersKind = MetersKind.HeatMeter;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs b/TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs
index 2e797d934..0ca720493 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/FactorySingle.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Xml
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.Xml
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.Single", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.Xml.Single", this, Common.MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs b/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs
index 747c072a9..510259b24 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/Writer.cs
@@ -7,7 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl;
 using TBF.Resources;
 
@@ -274,7 +274,7 @@ namespace TBF.BenchControl.Output.FileWriters.Xml
 			/// Test items
             foreach (var mtr in wm.RegularMeterTestRslts())
 			{
-                if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
+                if ((mtr != null) && (mtr.Publish() == Publish.Always))
 				{
 					wr.WriteLine(string.Format("    <{0}>", testTag));
 					for (int i = 0; i < testItems.Count; i++)
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs
index cd05fd528..58eba054d 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.Xml
@@ -31,14 +32,14 @@ namespace TBF.BenchControl.Output.FileWriters.Xml
         public string[] TestItems;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
 		{
 		}
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs
index 868d34f77..bfe2997ab 100644
--- a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/Factory.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/Factory.cs
index b05291b2d..4cfe76f4d 100644
--- a/TBF/BenchControl/Output/FileWriters/XmlBatch/Factory.cs
+++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/Factory.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.XmlBatch
@@ -15,12 +16,12 @@ namespace TBF.BenchControl.Output.FileWriters.XmlBatch
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Writer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.XmlBatch", this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new WriterCfg("FileWriter.XmlBatch", this, MetersKind.Single); }
 
         public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
         {
             IComponentCfg cfg = ComponentCfgBase.CreateFromDbEntity(WriterCfg.Serializer, component, this);
-            (cfg as WriterCfg).MetersKind = Config.Entities.MetersKind.Single;
+            (cfg as WriterCfg).MetersKind = MetersKind.Single;
             return cfg;
         }
 	}
diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs
index 3a7800c1f..3226ca2b5 100644
--- a/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs
+++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/Writer.cs
@@ -7,7 +7,7 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl;
 using TBF.Resources;
 
@@ -295,7 +295,7 @@ namespace TBF.BenchControl.Output.FileWriters.XmlBatch
 				/// Test items
                 foreach (var mtr in wm.RegularMeterTestRslts())
 				{
-					if ((mtr != null) && (mtr.Publish() == Config.Entities.Publish.Always))
+					if ((mtr != null) && (mtr.Publish() == Publish.Always))
 					{
 						wr.WriteLine(string.Format("        <{0}>", testTag));
 						for (int i = 0; i < testItems.Count; i++)
diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs
index 42690711d..80fd021fe 100644
--- a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs
+++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.FileWriters.XmlBatch
@@ -33,14 +34,14 @@ namespace TBF.BenchControl.Output.FileWriters.XmlBatch
 		public string[] TestItems;
 
         [XmlIgnore]
-        public Config.Entities.MetersKind MetersKind;
+        public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		WriterCfg()
 		{
 		}
 
-        public WriterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+        public WriterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
             Name = name;
diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfgCtrl.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfgCtrl.cs
index b66e1f330..6eac8f2db 100644
--- a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs
index acb8f9ea5..0303d71d5 100644
--- a/TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/Printers/Enhanced/FactoryCompound.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2017 Sensus Metering Systems
 ///
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Enhanced
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Compound", this, Config.Entities.MetersKind.Combined); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Compound", this, MetersKind.Combined); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs
index d5b1a0376..917f6ad4c 100644
--- a/TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/Printers/Enhanced/FactoryHeatMeters.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.HeatMeters", this, Common.MetersKind.HeatMeter); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs b/TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs
index 3faff172e..8976536e9 100644
--- a/TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs
+++ b/TBF/BenchControl/Output/Printers/Enhanced/FactorySingle.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2017 Sensus Metering Systems
 ///
 using System.Collections.Generic;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Enhanced
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Single", this, Config.Entities.MetersKind.Single); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Enhanced.Single", this, MetersKind.Single); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs
index 525d8f404..32a0acfae 100644
--- a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs
@@ -3,7 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Enhanced
@@ -50,14 +50,14 @@ namespace TBF.BenchControl.Output.Printers.Enhanced
         public int BarcodeHeight;
 
 		[XmlIgnore]
-		public Config.Entities.MetersKind MetersKind;
+		public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		PrinterCfg()
 		{
         }
 
-		public PrinterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+		public PrinterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
 			Name = name;
diff --git a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs
index 3dba77cc4..a1f333d99 100644
--- a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Output.Printers;
 using TBF.BenchControl.Configs;
diff --git a/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs
index 1b749d5db..82ca9e478 100644
--- a/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Label
diff --git a/TBF/BenchControl/Output/Printers/Label/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Label/PrinterCfgCtrl.cs
index 1fb7d0e81..ef1aa04b6 100644
--- a/TBF/BenchControl/Output/Printers/Label/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/Label/PrinterCfgCtrl.cs
@@ -6,6 +6,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Output.Printers;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs
index 21ca924b2..6f5ea9d7b 100644
--- a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.MultiLabel
diff --git a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfgCtrl.cs
index bc0f6541e..93e48c2cb 100644
--- a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Output.Printers;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs
index fa28fdd2e..3620b3f99 100644
--- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Munich
diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs
index cbfbf42fe..f4295a4ca 100644
--- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/Munich/PrinterCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Output/Printers/OnePerBatch/Factory.cs b/TBF/BenchControl/Output/Printers/OnePerBatch/Factory.cs
index c66431c37..57a40dd23 100644
--- a/TBF/BenchControl/Output/Printers/OnePerBatch/Factory.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerBatch/Factory.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerBatch
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-        public IComponentCfg DefaultConfig() { return new PrinterCfg(this.GetType().Namespace.Substring(24), this, Config.Entities.MetersKind.Single); }
+        public IComponentCfg DefaultConfig() { return new PrinterCfg(this.GetType().Namespace.Substring(24), this, Common.MetersKind.Single); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs
index b85a89df9..d9b7e6f89 100644
--- a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs
@@ -3,7 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.OnePerBatch
@@ -73,14 +73,14 @@ namespace TBF.BenchControl.Output.Printers.OnePerBatch
         public string DocName;
 
 		[XmlIgnore]
-		public Config.Entities.MetersKind MetersKind;
+		public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		PrinterCfg()
 		{
         }
 
-		public PrinterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+		public PrinterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
 			Name = name;
diff --git a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfgCtrl.cs
index af693a0b7..0f8a3f0f6 100644
--- a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfgCtrl.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs
index 32ae37d14..cbc026fbc 100644
--- a/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryCompound.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.Compound", this, Config.Entities.MetersKind.Combined); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.Compound", this, Common.MetersKind.Combined); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs
index 211fb1149..90cf22b18 100644
--- a/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerMeter/FactoryHeatMeters.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.HeatMeters", this, Common.MetersKind.HeatMeter); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs
index aaf0605e0..df05c9181 100644
--- a/TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerMeter/FactorySingle.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerMeter
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.Single", this, Config.Entities.MetersKind.Single); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.OnePerMeter.Single", this, Common.MetersKind.Single); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs
index 5c4764207..cec808270 100644
--- a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs
@@ -3,7 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.OnePerMeter
@@ -78,14 +78,14 @@ namespace TBF.BenchControl.Output.Printers.OnePerMeter
         public int BarcodeHeight;
 
 		[XmlIgnore]
-		public Config.Entities.MetersKind MetersKind;
+		public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		PrinterCfg()
 		{
         }
 
-		public PrinterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+		public PrinterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
 			Name = name;
diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs
index d259a8c23..94d4fb8c0 100644
--- a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfgCtrl.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Output.Printers;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs
index 56fa1dafd..eef4d394d 100644
--- a/TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs
+++ b/TBF/BenchControl/Output/Printers/Zapiska/FactoryCompound.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.Compound", this, Config.Entities.MetersKind.Combined); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.Compound", this, Common.MetersKind.Combined); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs
index 7d8c79265..a0c2102a8 100644
--- a/TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs
+++ b/TBF/BenchControl/Output/Printers/Zapiska/FactoryHeatMeters.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.HeatMeters", this, Config.Entities.MetersKind.HeatMeter); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.HeatMeters", this, Common.MetersKind.HeatMeter); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs b/TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs
index 2a3cede04..454d5580b 100644
--- a/TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs
+++ b/TBF/BenchControl/Output/Printers/Zapiska/FactorySingle.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
 
 		public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new Printer(cfg); }
 
-		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.Single", this, Config.Entities.MetersKind.Single); }
+		public IComponentCfg DefaultConfig() { return new PrinterCfg("Printer.Zapiska.Single", this, Common.MetersKind.Single); }
 
 		public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
 		{
diff --git a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs
index 762832884..25f143d87 100644
--- a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs
+++ b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs
@@ -3,7 +3,7 @@
 ///
 using System.Collections.Generic;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.Output.Printers.Zapiska
@@ -61,14 +61,14 @@ namespace TBF.BenchControl.Output.Printers.Zapiska
         public string DocName;
 
 		[XmlIgnore]
-		public Config.Entities.MetersKind MetersKind;
+		public MetersKind MetersKind;
 
 		/// Private parameterless constructor invoked by all other (public) constructors
 		PrinterCfg()
 		{
         }
 
-		public PrinterCfg(string name, IComponentFactory factory, Config.Entities.MetersKind metersKind)
+		public PrinterCfg(string name, IComponentFactory factory, MetersKind metersKind)
             : this()
         {
 			Name = name;
diff --git a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs
index b569ec77d..635b972a0 100644
--- a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs
+++ b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/OutputPath.cs b/TBF/BenchControl/OutputPath.cs
index dffeb6fa4..c5a7441ce 100644
--- a/TBF/BenchControl/OutputPath.cs
+++ b/TBF/BenchControl/OutputPath.cs
@@ -14,7 +14,7 @@ namespace TBF.BenchControl
         public float Qto;
         public string Selector;
         public IFlowMeter FlowMeter;
-        public IRegulValve RegulValve;
+        public IRegValve RegulValve;
 		public float PidCoef;
         public IDiverter Diverter;
         public ITempMeter TempDiv;
@@ -48,7 +48,7 @@ namespace TBF.BenchControl
 			Qto = entity.Qto;
             Selector = entity.Selector;
             FlowMeter = (IFlowMeter)TbfComponents.FindComponent(entity.FlowMeter, components);
-            RegulValve = (IRegulValve)TbfComponents.FindComponent(entity.RegulValve, components);
+            RegulValve = (IRegValve)TbfComponents.FindComponent(entity.RegulValve, components);
 			PidCoef = entity.PidCoef;
 			Diverter = (IDiverter)TbfComponents.FindComponent(entity.Diverter, components);
 			TempDiv = (ITempMeter)TbfComponents.FindComponent(entity.TempDiv, components);
@@ -57,7 +57,7 @@ namespace TBF.BenchControl
             int regvCount = 0;
             foreach (var cmpnt in components)
             {
-                if ((cmpnt is IRegulValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem)) regvCount++;
+                if ((cmpnt is IRegValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem)) regvCount++;
             }
             RegulValvesPct = string.IsNullOrEmpty(entity.RegulValvesPct) ? new float[0] : Utils.GetRegulValvesPositions(entity.RegulValvesPct, regvCount);
 
diff --git a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImport.cs b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImport.cs
index 658d76c5f..512e63d46 100644
--- a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImport.cs
+++ b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImport.cs
@@ -5,7 +5,7 @@ using System;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using log4net;
-using Config.Entities;
+using Common;
 using DataStreamInterface;
 
 namespace TBF.BenchControl.RegisterReaders.DataStream.MefImport
diff --git a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs
index adc08d35a..7474f32e2 100644
--- a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs
+++ b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs b/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
index b09b5e792..44a5ae162 100644
--- a/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
+++ b/TBF/BenchControl/RegisterReaders/DataStream/Reader/Reader.cs
@@ -7,7 +7,7 @@ using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
 using System.Xml.Serialization;
 using log4net;
-using Config.Entities;
+using Common;
 using DataStreamInterface;
 using TBF.BenchControl;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs b/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs
index 08ec56270..1f6d8dc4f 100644
--- a/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs
+++ b/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs
index 5c386333c..f3e9de8aa 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/Radio/Radio.cs b/TBF/BenchControl/RegisterReaders/KPackE/Radio/Radio.cs
index 01efe6299..e4b983fe5 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/Radio/Radio.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/Radio/Radio.cs
@@ -8,7 +8,7 @@ using System.Globalization;
 using System.IO.Ports;
 using System.Text;
 using System.Threading;
-using Config.Entities;
+using Common;
 using log4net;
 using TBF.BenchControl.Generic;
 using TBF.Boxes;
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
index 99b9f392d..45b2350b1 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/ProcedureParams.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/ProcedureParams.cs
index 93733a806..81db22527 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/ProcedureParams.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/ProcedureParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs
index 56b2e5e20..9a0d552f4 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
@@ -27,7 +28,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader
                 return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
             }
         }
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Manual; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Manual; } }
         public double PulsesPerLtr { get { return rrCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); } }
 
diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs
index 9b287a3ae..3d9acaea5 100644
--- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs
+++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs
index b7fa6f4cf..abc42bbf8 100644
--- a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs
+++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RRProcedureParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs
index 9252f9f7a..babe835e0 100644
--- a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs
+++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReader.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.Boxes;
 
 namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
@@ -17,7 +18,7 @@ namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB
 
 		public int Position { get { return registerReaderCfg.Position; } }		/// 1 .. inf
 																				/// 
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.Pulses; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.Pulses; } }
         public double PulsesPerLtr { get { return registerReaderCfg.ProcParams.PulsesPerLtr; } }
 		public double LtrsPerPulse { get { return (PulsesPerLtr <= float.Epsilon) ? 1.0 : (1 / PulsesPerLtr); ; } }
         public int Filter { get { return registerReaderCfg.ProcParams.Filter; } }
diff --git a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs
index ce72098e1..07f189d30 100644
--- a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs
+++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.UI.Bench.Components;
diff --git a/TBF/BenchControl/RegisterReaders/SerialStream/ProcParams.cs b/TBF/BenchControl/RegisterReaders/SerialStream/ProcParams.cs
index 7489763ac..cdeeb060e 100644
--- a/TBF/BenchControl/RegisterReaders/SerialStream/ProcParams.cs
+++ b/TBF/BenchControl/RegisterReaders/SerialStream/ProcParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs
index 28a873a63..9ebb30d0e 100644
--- a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs
+++ b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStream.cs
@@ -6,7 +6,7 @@ using System.IO;
 using System.IO.Ports;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl.RegisterReaders.SerialStream
@@ -31,7 +31,7 @@ namespace TBF.BenchControl.RegisterReaders.SerialStream
                 return (firstDigitPos < 0) ? 0 : (int.TryParse(Name.Substring(firstDigitPos), out position) ? position : 0);
             }
         }
-        public Config.Entities.RegisterReaderType RegisterReaderType { get { return Config.Entities.RegisterReaderType.DataStream; } }
+        public RegisterReaderType RegisterReaderType { get { return RegisterReaderType.DataStream; } }
         public double PulsesPerLtr { get { return 1000.0; } }
 		public double LtrsPerPulse { get { return 1 / PulsesPerLtr; } }
 
diff --git a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfgCtrl.cs
index a64c31e83..b70f0537b 100644
--- a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfgCtrl.cs
+++ b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using System.IO.Ports;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs
index 02b5df966..b3b1d690c 100644
--- a/TBF/BenchControl/Sequences/MainSeq.cs
+++ b/TBF/BenchControl/Sequences/MainSeq.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using Results.Entities;
 using TBF.BenchControl.Operations;
@@ -225,7 +226,7 @@ namespace TBF.BenchControl.Sequences
 
                 try
                 {
-                    using (ISession localSession = TBF.DB.CreateSession(Users.Entities.DBKind.Config))
+                    using (ISession localSession = TBF.DB.CreateSession(Common.DBKind.Config))
                     {
                         StateMachine.LoadPathsAndTransitions(localSession);
                     }
@@ -237,10 +238,10 @@ namespace TBF.BenchControl.Sequences
                     {
                         /// User has chosen to restore an interrupted session and necessary conditions are met
                         
-                        /// TODO: Repeate twice for Users.Entities.DBKind.Config and Users.Entities.DBKind.RemoteConfig
+                        /// TODO: Repeate twice for Common.DBKind.Config and Common.DBKind.RemoteConfig
                         using (ISession remoteOrLocalSession = TBF.DB.CreateSession(isRemoteIntProc ?
-                                                                                                 Users.Entities.DBKind.RemoteConfig :
-                                                                                                 Users.Entities.DBKind.Config))
+                                                                                                 Common.DBKind.RemoteConfig :
+                                                                                                 Common.DBKind.Config))
                         {
                             StateMachine.LoadProcedure(remoteOrLocalSession, interruptedProcedureName, isRemoteIntProc);
                             StateMachine.LoadProcedureParams(StateMachine.Procedure);
@@ -267,10 +268,10 @@ namespace TBF.BenchControl.Sequences
                             }
                         }
 
-                        /// TODO: Repeate twice for Users.Entities.DBKind.Config and Users.Entities.DBKind.RemoteConfig
+                        /// TODO: Repeate twice for Common.DBKind.Config and Common.DBKind.RemoteConfig
                         using (ISession remoteOrLocalSession = TBF.DB.CreateSession(Bridge.SelectedProcedure.IsRemote ?
-                                                                                                 Users.Entities.DBKind.RemoteConfig :
-                                                                                                 Users.Entities.DBKind.Config))
+                                                                                                 Common.DBKind.RemoteConfig :
+                                                                                                 Common.DBKind.Config))
                         {
                             StateMachine.LoadProcedure(remoteOrLocalSession, Bridge.SelectedProcedure.Name, Bridge.SelectedProcedure.IsRemote, testsInside);
                             StateMachine.LoadProcedureParams(StateMachine.Procedure);
@@ -572,15 +573,15 @@ namespace TBF.BenchControl.Sequences
                                         if (wm.LastRecordIsNok)
                                         {
                                             /// There is still a production tracing error, last record is missing
-                                            wm.ErrorFlags |= (int)Config.Entities.ErrorFlagMask.E28;                /// Set E28
+                                            wm.ErrorFlags |= (int)ErrorFlagMask.E28;                /// Set E28
                                         }
                                         else
                                         {
                                             /// No production tracing error, last record is OK
-                                            wm.ErrorFlags &= ~(int)Config.Entities.ErrorFlagMask.E28;               /// Clear E28
+                                            wm.ErrorFlags &= ~(int)ErrorFlagMask.E28;               /// Clear E28
                                         }
 
-                                        if ((wm.ErrorFlags & (int)Config.Entities.ErrorFlagMask.E28) != 0)
+                                        if ((wm.ErrorFlags & (int)ErrorFlagMask.E28) != 0)
                                         {
                                             /// Previous workstep missing or NOK (production tracing error)
                                             mtr.ErrorIndicators |= (int)ErrorFlagMask.E28;
@@ -732,7 +733,7 @@ namespace TBF.BenchControl.Sequences
 				{
                     Test test = StateMachine.TestInstances[i].Test;
 
-					TimeEstimateTotal += (test.TstTime + 10.0f);
+					TimeEstimateTotal += (test.TestTime + 10.0f);
 
 					/// Try to fetch all test paths and transitions
 					/// to detect configuration errors as early as possible.
@@ -794,7 +795,7 @@ namespace TBF.BenchControl.Sequences
                         nextQfrom = nextHydroTest.Qfrom;
                         nextQto = nextHydroTest.Qto;
                         nextPumpPower = nextHydroTest.PumpPower;
-                        nextTolerRed = nextHydroTest.TolerRed;
+                        nextTolerRed = nextHydroTest.ShortPulses;
                         nextPidCoef = (nextOutPath != null) ? nextOutPath.PidCoef : 1.0F;
                     }
                     else
@@ -865,8 +866,8 @@ namespace TBF.BenchControl.Sequences
                             int timeEstTransBetween = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionBetween) : 1;
                             int timeEstTransAfter = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionAfter) : 1;
 
-                            TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(testInst.Test.TstTime) + 15, timeEstTransAfter, 0 });
-                            Bridge.OnTestProgress(this, new TestProgressEventArgs(testInst.Test, testInst.Repetition, Config.Entities.Progress.JustStarted));
+                            TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(testInst.Test.TestTime) + 15, timeEstTransAfter, 0 });
+                            Bridge.OnTestProgress(this, new TestProgressEventArgs(testInst.Test, testInst.Repetition, Progress.JustStarted));
 
                             bool currentTestFinished = true;
                             bool doOneMoreRepetition = false;
@@ -895,8 +896,8 @@ namespace TBF.BenchControl.Sequences
                                                                                  && !e.Contains(Event.OpArgumentError)
                                                                                  && !e.Contains(Event.UiCmdStop));
 
-                            Bridge.OnTestProgress(this, new TestProgressEventArgs(testInst.Test, testInst.Repetition, currentTestFinished ? Config.Entities.Progress.Completed
-                                                                                                                                          : Config.Entities.Progress.Aborted));
+                            Bridge.OnTestProgress(this, new TestProgressEventArgs(testInst.Test, testInst.Repetition, currentTestFinished ? Progress.Completed
+                                                                                                                                          : Progress.Aborted));
 
                             if (testMethod.DoTransitions() && !e.Contains(Event.RecoverableError))
                             {
@@ -1064,9 +1065,9 @@ namespace TBF.BenchControl.Sequences
                         int timeEstTransBetween = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionBetween) : 1;
                         int timeEstTransAfter = testMethod.DoTransitions() ? GetTransitionTimeEst(transitionAfter) : 1;
 
-                        TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(test.TstTime) + 15, timeEstTransAfter, 0 });  
+                        TestProgressEventArgs.SetEstimatedTimes(new int[] { 1, timeEstTransBefore, 1, 30, 0, Convert.ToInt32(test.TestTime) + 15, timeEstTransAfter, 0 });  
                                                                         /// start, transition, flow detection, flow setting, aborted, test, transition, end
-			            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, Config.Entities.Progress.JustStarted));
+			            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, Progress.JustStarted));
 
                         if (testMethod.DoTransitions())
                         {
@@ -1089,8 +1090,8 @@ namespace TBF.BenchControl.Sequences
                                                                            && !e.Contains(Event.OpArgumentError)
                                                                            && !e.Contains(Event.UiCmdStop));
 
-                        Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, testFinished ? Config.Entities.Progress.Completed
-                                                                                                          : Config.Entities.Progress.Aborted));
+                        Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, testFinished ? Progress.Completed
+                                                                                                          : Progress.Aborted));
 
                         if (testMethod.DoTransitions())
                         {
@@ -1098,8 +1099,8 @@ namespace TBF.BenchControl.Sequences
                             rsltTransAfter = Transition(transitionAfter, endContext);   /// Transition or SetRoute - end of test
                         }
 
-                        Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, testFinished ? Config.Entities.Progress.Completed
-                                                                                                          : Config.Entities.Progress.Aborted));
+                        Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetNr, testFinished ? Progress.Completed
+                                                                                                          : Progress.Aborted));
                     }
 
 					if (rsltTransBefore == Event.Error || e.Contains(Event.Error))         goto error;
diff --git a/TBF/BenchControl/Sequences/MainSeqUtils.cs b/TBF/BenchControl/Sequences/MainSeqUtils.cs
index e6e98bd22..8b09944c1 100644
--- a/TBF/BenchControl/Sequences/MainSeqUtils.cs
+++ b/TBF/BenchControl/Sequences/MainSeqUtils.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
 using TBF.BenchControl.Operations;
diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs
index c5478f0ae..3993c395e 100644
--- a/TBF/BenchControl/Sequences/SequenceBase.cs
+++ b/TBF/BenchControl/Sequences/SequenceBase.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using log4net;
+using Common;
 using Config;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
@@ -38,9 +39,9 @@ namespace TBF.BenchControl.Sequences
 		/// Global static variables set only once.
 		///------------------------------------------------------------
         public static IList<IFlowMeter> FlowMeters;         /// list of reference flowmeters
-        public static IList<IRegulValve> RegulValves;       /// list of regulation valves
-        public static IList<IRegulValve> FeedingRegulValves; /// list of feeding regulation valves
-        public static IList<IRegulValve> OutputRegulValves; /// list of output regulation valves
+        public static IList<IRegValve> RegulValves;       /// list of regulation valves
+        public static IList<IRegValve> FeedingRegulValves; /// list of feeding regulation valves
+        public static IList<IRegValve> OutputRegulValves; /// list of output regulation valves
         public static IList<IPumpFM> PumpsWithFM;           /// list of FM controlled pumps
 		public static IList<IWaterMeter> WaterMeters;       /// list of water meters
 		public static IList<ICamera> Cameras;		        /// list of cameras
@@ -494,7 +495,7 @@ namespace TBF.BenchControl.Sequences
 
 
         /// return SetRegValvePositionOp operations for RV-s with changed positions
-        IList<IOperation> GetRegValvePositioningOps(IList<IRegulValve> regValves, float[] regValvePositions)
+        IList<IOperation> GetRegValvePositioningOps(IList<IRegValve> regValves, float[] regValvePositions)
         {
             IList<IOperation> rvPosOps = new List<IOperation>();
 
@@ -1005,7 +1006,7 @@ namespace TBF.BenchControl.Sequences
 		}
 
 
-        protected Event SetFlowEtc(Test test, IFlowMeter flowMeter, IRegulValve regulValve, IValve pump, IValve stopBFValve, IList<IOperation> extraOperations, bool doNotWait)
+        protected Event SetFlowEtc(Test test, IFlowMeter flowMeter, IRegValve regulValve, IValve pump, IValve stopBFValve, IList<IOperation> extraOperations, bool doNotWait)
         {
             IList<Event> e;
             Event retVal = Event.Done;
@@ -1020,8 +1021,8 @@ namespace TBF.BenchControl.Sequences
             do
             {
                 e = StateMachine.WaitRunDevsRunOps();
-                //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
                 if (e.Contains(Event.Error)) return Event.Error;
@@ -1039,8 +1040,8 @@ namespace TBF.BenchControl.Sequences
                 do
                 {
                     e = StateMachine.WaitRunDevsRunOps();
-                    //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
                 }
@@ -1075,8 +1076,8 @@ namespace TBF.BenchControl.Sequences
                 do
                 {
                     e = StateMachine.WaitRunDevsRunOps();
-                    //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
                 }
@@ -1095,8 +1096,8 @@ namespace TBF.BenchControl.Sequences
             do
             {
                 e = StateMachine.WaitRunDevsRunOps();
-                //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                //Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                //Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) return Event.OpArgumentError;
                 if (TestAndLogUiCmdStop(e)) return Event.UiCmdStop;
@@ -2046,7 +2047,7 @@ namespace TBF.BenchControl.Sequences
                 log.FatalFormat("   Output path: {0}", (outPath != null) ? outPath.ToString() : "none");
                 if (inPath.Pump is IPump) log.FatalFormat("   Pump power: {0}%", (inPath.Pump as IPump).Power);
                 else if (inPath.Pump is IValve) log.FatalFormat("   Feeding valve: {0}", (inPath.Pump as IValve).State ? "open" : "close");
-                if (outPath.RegulValve is IRegulValve) log.FatalFormat("   Regulation valve position: {0}%", outPath.RegulValve.Position);
+                if (outPath.RegulValve is IRegValve) log.FatalFormat("   Regulation valve position: {0}%", outPath.RegulValve.Position);
                 log.FatalFormat("   Flow: {0}", RefFlow);
                 log.FatalFormat("   Mass: {0}", Mass);
                 log.FatalFormat("   Start mass: {0}", StartMass);
diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs
index efd1568d4..c26a1f0e7 100644
--- a/TBF/BenchControl/StateMachine.cs
+++ b/TBF/BenchControl/StateMachine.cs
@@ -7,6 +7,7 @@ using System.Threading;
 using System.Collections.Generic;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.BenchControl.GenericDevices;
@@ -214,7 +215,7 @@ namespace TBF.BenchControl
         {
             /// Load the list of components (entities) from the database.
 			/// Then create the components (derived from IComponent).
-			components = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Users.Entities.DBKind.Config));
+			components = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Common.DBKind.Config));
 			MasterValves = GenericDevices.ValveBase.MasterValves(components);
 			CoupledValves = GenericDevices.ValveBase.CoupledValves(components);
 			ExtendedValves = GenericDevices.ValveBase.ExtendedValves(components);
@@ -224,9 +225,9 @@ namespace TBF.BenchControl
 			IList<IScaleOrTank> tanks = new List<IScaleOrTank>();
             ProcessData.IperlHeads = new List<TestMethods.iPerlCommunication.iPerlHead.IperlHead>();
             SequenceBase.FlowMeters = new List<IFlowMeter>();
-            SequenceBase.RegulValves = new List<IRegulValve>();
-            SequenceBase.FeedingRegulValves = new List<IRegulValve>();
-            SequenceBase.OutputRegulValves = new List<IRegulValve>();
+            SequenceBase.RegulValves = new List<IRegValve>();
+            SequenceBase.FeedingRegulValves = new List<IRegValve>();
+            SequenceBase.OutputRegulValves = new List<IRegValve>();
             SequenceBase.PumpsWithFM = new List<IPumpFM>();
 			SequenceBase.WaterMeters = new List<IWaterMeter>();
 			SequenceBase.Cameras = new List<ICamera>();
@@ -256,9 +257,9 @@ namespace TBF.BenchControl
                     ProcessData.IperlHeads.Add(cmpnt as TestMethods.iPerlCommunication.iPerlHead.IperlHead);
                 }
                 if (cmpnt is IFlowMeter) SequenceBase.FlowMeters.Add(cmpnt as IFlowMeter);
-				if ((cmpnt is IRegulValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
+				if ((cmpnt is IRegValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
 				{
-                    IRegulValve rv = cmpnt as IRegulValve;
+                    IRegValve rv = cmpnt as IRegValve;
 					SequenceBase.RegulValves.Add(rv);
                     if (rv.Category == ValveCategory.Feeding) SequenceBase.FeedingRegulValves.Add(rv);
                     if (rv.Category == ValveCategory.Output)  SequenceBase.OutputRegulValves.Add(rv);
@@ -430,7 +431,7 @@ namespace TBF.BenchControl
             
             try
             {
-                ISession remoteSession = TBF.DB.CreateSession(Users.Entities.DBKind.RemoteConfig);
+                ISession remoteSession = TBF.DB.CreateSession(Common.DBKind.RemoteConfig);
                 remoteFeedingPaths = remoteSession.QueryOver<Config.Entities.FeedingPath>().List();
                 remoteBenchPaths = remoteSession.QueryOver<Config.Entities.BenchPath>().List();
                 remoteOutputPaths = remoteSession.QueryOver<Config.Entities.OutputPath>().List();
@@ -443,7 +444,7 @@ namespace TBF.BenchControl
                 return false;
             }
 
-            ISession localSession = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+            ISession localSession = TBF.DB.CreateSession(Common.DBKind.Config);
             var localFeedingPaths = localSession.QueryOver<Config.Entities.FeedingPath>().List();
             var localBenchPaths = localSession.QueryOver<Config.Entities.BenchPath>().List();
             var localOutputPaths = localSession.QueryOver<Config.Entities.OutputPath>().List();
@@ -573,7 +574,7 @@ namespace TBF.BenchControl
             Procedure = null;
 
             IList<Procedure> selectedProcs = session.QueryOver<Procedure>()
-                                                    .Where(x => (x.ProcedureState == ProcedureState.Active))
+                                                    .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
                                                     .And(x => (x.Name == procedureName))
                                                     .List();
             if (selectedProcs.Count == 1)
@@ -683,9 +684,9 @@ namespace TBF.BenchControl
 
             foreach (var tr in TransitionSequences)
 			{
-				if (tr.Name == test.RelTransBefore) transitionBefore = tr;
-                if (tr.Name == test.RelTransBetween) transitionBetween = tr;
-                if (tr.Name == test.TransitionAfter) transitionAfter = tr;
+				if (tr.Name == test.TransBefore) transitionBefore = tr;
+                if (tr.Name == test.TransBetween) transitionBetween = tr;
+                if (tr.Name == test.TransAfter) transitionAfter = tr;
 			}
 
             if (isHydroTest && pout.Scale == null)
diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs
index f26c43c6f..47cd84b1b 100644
--- a/TBF/BenchControl/TbfComponents.cs
+++ b/TBF/BenchControl/TbfComponents.cs
@@ -2,7 +2,7 @@
 /// Copyright (c) 2013-2019 Sensus Slovensko a.s.
 ///
 using System.Collections.Generic;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 
 namespace TBF.BenchControl
@@ -218,7 +218,7 @@ namespace TBF.BenchControl
         /// </summary>
         /// <param name="entity">DB entity</param>
         /// <returns>An appropriate component configuration or null if factory was not found</returns>
-		public static IComponentCfg CmpntCfgFromCmpntEntity(Component entity)
+		public static IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component entity)
 		{
             IComponentFactory cmpntFactory = CmpntFactoryFromClassName(entity.ClassName);
             if (cmpntFactory == null) return null;
@@ -241,9 +241,9 @@ namespace TBF.BenchControl
             CurrentlyLoadedComponentName = string.Empty;
 
 			/// Load the list of components from the database
-			IList<Component> cmptnEntities = session.QueryOver<Component>()
-                                                    .OrderBy(x => x.ItemNr).Asc
-				                                    .List();
+            var cmptnEntities = session.QueryOver<Config.Entities.Component>()
+                                       .OrderBy(x => x.ItemNr).Asc
+				                       .List();
 
 			/// Convert database entities to TBF components
 			IList<IComponent> components = new List<BenchControl.Generic.IComponent>();
diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index 3625bb784..d603caf57 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
@@ -104,7 +105,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -138,7 +139,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
             }
             while (e.Contains(Event.Busy));
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
             TestStartTime = DateTime.Now;
             int flowSetTime0 = StateMachine.Time;
 
@@ -155,8 +156,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -174,8 +175,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -208,8 +209,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -229,8 +230,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e))		 { retVal = Event.UiCmdStop; goto stopTest; }
@@ -320,7 +321,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_in_progress);
 			//------------------------------------------------
-			if (mode == Config.Entities.DebugMode.Simulate)
+			if (mode == DebugMode.Simulate)
 			{
 				/// TODO: Reimplement
 				//tstRslt = MakeSimulated(test, 1, simulatedError);
@@ -375,8 +376,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 					RefFlow.Val = cBrd.ReferenceFlow;
 					UpdateAllStatistics(StateMachine.Time);
 
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 				}
 			/// Measurement loop - end
 
diff --git a/TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs
index 74fe03f65..f591a907b 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs
index bdb15570e..42de47324 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.Adjustment
diff --git a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs
index 47cb3bdb7..68b1f5ca0 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm12.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.Adjustment
diff --git a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs
index fe2b461a9..2f588bf79 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm24.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.Adjustment
diff --git a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm48.cs b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm48.cs
index 113294c38..d90566e4e 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm48.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/WMErrorsForm48.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.Adjustment
diff --git a/TBF/BenchControl/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs b/TBF/BenchControl/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs
index e144f1e62..bf7c3734a 100644
--- a/TBF/BenchControl/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/ChangeFlowDirection/ChangeFlowDirectionSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 
@@ -48,7 +49,7 @@ namespace TBF.BenchControl.TestMethods.ChangeFlowDirection
             ///
             /// Empty the line
             ///
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionBefore));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionBefore));
             switch (Transition(benchEmptySeq, TransitionContext.PurgeEnd))
             {
                 case Event.Error:
@@ -63,7 +64,7 @@ namespace TBF.BenchControl.TestMethods.ChangeFlowDirection
             /// Show a dialog with OK button and an appropriate message
             ///
             Bridge.OnAdjustmentInProgress(this, new AdjustmentInProgressEventArgs(testName));
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             Bridge.OnActivity(this, test.Method);
             State.Create(string.Format("{0}({1}) : Turn the direction of watermeters", test.Method, test.Name))
                  .AddOperation(checkUiOp)
@@ -74,7 +75,7 @@ namespace TBF.BenchControl.TestMethods.ChangeFlowDirection
             {
                 e = StateMachine.WaitRunDevsRunOps();
 
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Test));
 
                 if (e.Contains(Event.Error))      goto stopTest;
                 if (TestAndLogUiCmdStop(test, e)) goto stopTest;
@@ -96,7 +97,7 @@ namespace TBF.BenchControl.TestMethods.ChangeFlowDirection
             ///
             /// Fill the line
             ///
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
             switch (Transition(benchFillSeq, TransitionContext.PurgeBegin))
             {
                 case Event.Error:
diff --git a/TBF/BenchControl/TestMethods/ChangeFlowDirection/TestMethod.cs b/TBF/BenchControl/TestMethods/ChangeFlowDirection/TestMethod.cs
index 111dad8c1..3956e8379 100644
--- a/TBF/BenchControl/TestMethods/ChangeFlowDirection/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/ChangeFlowDirection/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs
index 6640806fd..80e372cbe 100644
--- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs
+++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetTestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index 6fd3da386..78b3f914c 100644
--- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using TBF.BenchControl;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -21,9 +22,9 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 
         public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
 									CombinedWithDetTestParams testParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
 			{
 				return Simulate(test, repetitionNr, isLastRepetition, testParams);
 			}
@@ -84,7 +85,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -146,7 +147,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, heatMetersPath, totalPulses));
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 			Qrise = 0;
 			Qfall = 0;
@@ -233,7 +234,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
 				if (TestAndLogUiCmdStop(test,e)) goto stopTest;
 			}
@@ -244,11 +245,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed))
+                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.ShortPulses))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
 				if (TestAndLogUiCmdStop(test,e)) goto stopTest;
 				if (e.Contains(Event.RegulValveTimeOut))
@@ -293,7 +294,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             double detectedFlow = 0;
 
 			int detectionStartTime = StateMachine.Time;
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
 			do
             {
@@ -305,7 +306,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
                     if (TestAndLogUiCmdStop(test, e)) goto stopTest;
                 }
@@ -438,8 +439,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
             bool goBackToInitFlow = ((rvPulse > 0) && (relativeQave < 0)) ||
                                     ((rvPulse < 0) && (relativeQave > 0));
 
-			Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (goBackToInitFlow)
@@ -453,8 +454,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test,e)) goto stopTest;
 					if (e.Contains(Event.RegulValveTimeOut))
@@ -476,8 +477,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (TestAndLogUiCmdStop(test,e)) goto stopTest;
 				//if (e.Contains(Event.FlowTimeOut)) goto do_detection;
@@ -536,7 +537,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			queryEnd2 = cBrd.QueryMeasurementEndOp();
 
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Read the diverter switch time
             switchTimeStart = 0.001f * (float)cBrd.DivTime(0);
@@ -576,8 +577,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				//            Formulas.ErrorFromVolumes(data.TestResult.CombinedMeters[i].VolumeMeter, data.Volume.Val);
 				//    }
 				//}
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
             /// Measurement loop - end
 
@@ -716,8 +717,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
                 {
                     if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                    Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-					Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+                    Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+					Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 					for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 					{
@@ -748,7 +749,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 						}
 					}
 
-					Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+					Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 					if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 					{
@@ -800,7 +801,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -867,7 +868,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 			///
 			/// Test method simulation
 			/// 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 			if (test.Name.ToLower().Contains("rise") || test.Name.ToLower().Contains("steig"))
 			{
@@ -878,7 +879,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
 				MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f);
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
 			allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
index bb160b107..e8569d94f 100644
--- a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs
index b07f208dd..a4f60e5cc 100644
--- a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/Counter/CounterSeq.cs b/TBF/BenchControl/TestMethods/Counter/CounterSeq.cs
index 2d3d75c2d..64a78f6ac 100644
--- a/TBF/BenchControl/TestMethods/Counter/CounterSeq.cs
+++ b/TBF/BenchControl/TestMethods/Counter/CounterSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 
diff --git a/TBF/BenchControl/TestMethods/Counter/TestMethod.cs b/TBF/BenchControl/TestMethods/Counter/TestMethod.cs
index 00c88305d..6163c02cb 100644
--- a/TBF/BenchControl/TestMethods/Counter/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/Counter/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/DiverterTest/Component.cs b/TBF/BenchControl/TestMethods/DiverterTest/Component.cs
index 83b2f413b..8fcb2f555 100644
--- a/TBF/BenchControl/TestMethods/DiverterTest/Component.cs
+++ b/TBF/BenchControl/TestMethods/DiverterTest/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.DiverterTest
diff --git a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
index 6a7a397c8..a0a01abbb 100644
--- a/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/DiverterTest/DiverterTestSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,7 +29,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-        public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition, TestParams testParams)
+        public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition, TestParams testParams)
 		{
 			IScale scale = outPath.Scale as IScale;
 			if (scale == null)
@@ -86,7 +88,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null)     readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -178,7 +180,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -191,8 +193,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -209,8 +211,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 	 				 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -243,8 +245,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -264,8 +266,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))  { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e))       { retVal = Event.UiCmdStop; goto stopTest; }
@@ -482,7 +484,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
                 /// Measurement loop - preparation
                 readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
 
-                int estimtdEndTime = StateMachine.Time + (int)(test.TstTime / testParams.DivRepetitions);
+                int estimtdEndTime = StateMachine.Time + (int)(test.TestTime / testParams.DivRepetitions);
 
                 /// Measurement loop - begin
                 State.Create(string.Format("{0}({1}) : Reading watermeters {2}", test.Method, test.Name, divRepetNr))
@@ -516,8 +518,8 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 
                     UpdateAllStatistics(StateMachine.Time);
 
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
                     if (e.Contains(Event.MeasurementCompleted)) break;
                 }
@@ -743,7 +745,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 					if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
 					/// MetersKind.Single meters
-					Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+					Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 					GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                     GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                     TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -866,7 +868,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfgCtrl.cs
index 609d50882..1220a8e39 100644
--- a/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/DiverterTest/TestParams.cs b/TBF/BenchControl/TestMethods/DiverterTest/TestParams.cs
index d9ac40a68..3fc8c7e34 100644
--- a/TBF/BenchControl/TestMethods/DiverterTest/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/DiverterTest/TestParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/Dummy/DummySeq.cs b/TBF/BenchControl/TestMethods/Dummy/DummySeq.cs
index 3eae445c8..52ed4867c 100644
--- a/TBF/BenchControl/TestMethods/Dummy/DummySeq.cs
+++ b/TBF/BenchControl/TestMethods/Dummy/DummySeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 
@@ -37,7 +38,7 @@ namespace TBF.BenchControl.TestMethods.Dummy
             /// Show a dialog with OK button and an appropriate message
             ///
             Bridge.OnAdjustmentInProgress(this, new AdjustmentInProgressEventArgs(testName));
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             Bridge.OnActivity(this, test.Method);
             State.Create(string.Format("{0}({1}) : Dummy", test.Method, test.Name))
                  .AddOperation(checkUiOp)
@@ -48,7 +49,7 @@ namespace TBF.BenchControl.TestMethods.Dummy
             {
                 e = StateMachine.WaitRunDevsRunOps();
 
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Test));
 
                 if (e.Contains(Event.Error))      goto stopTest;
                 if (TestAndLogUiCmdStop(test, e)) goto stopTest;
diff --git a/TBF/BenchControl/TestMethods/Dummy/TestMethod.cs b/TBF/BenchControl/TestMethods/Dummy/TestMethod.cs
index b96aab3f8..e897850bf 100644
--- a/TBF/BenchControl/TestMethods/Dummy/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/Dummy/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/Endurance/Component.cs b/TBF/BenchControl/TestMethods/Endurance/Component.cs
index f661d9115..190a9d12e 100644
--- a/TBF/BenchControl/TestMethods/Endurance/Component.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.Endurance
diff --git a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs
index 38afaa46d..24fd594b1 100644
--- a/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/CycleDlg.cs
@@ -46,7 +46,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
 											SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up |
@@ -62,7 +62,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 			seqStepsCtrl = new CycleStepsCtrl() as ITabWithListViewEx;
 
             /// Prepare a list of valves for the endurance test
-			TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Users.Entities.DBKind.Config));
+			TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Common.DBKind.Config));
 			Valves = new List<IValve>();
 			for (int bitNr = 0; bitNr < 8; bitNr++)
 			{
diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
index d0047a4cd..7ae5dd788 100644
--- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,9 +29,9 @@ namespace TBF.BenchControl.TestMethods.Endurance
         ///		Event.OpArgumentError  . Target flow is out of range
         ///		Event.Error  . . . . . . Unspecified error
         /// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
 									string enduranceCycleStr,
-                                    Config.Entities.DebugMode debugLevel)
+                                    DebugMode debugLevel)
         {
             int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
             if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
@@ -73,7 +75,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -140,8 +142,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -160,8 +162,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -287,7 +289,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
                 readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
                 queryEnd1 = cBrd.QueryMeasurementEndOp();
 
-                int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+                int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
                 StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
                 /// Measurement loop - begin
@@ -323,8 +325,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
 
 					UpdateAllStatistics(StateMachine.Time);
 
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
                 }
                 while (true);
             /// Measurement loop - end
@@ -397,7 +399,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
                         {
                             if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                            Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                            Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
                             GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                             GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                             TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -483,7 +485,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
                     /// Update results
                     Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
                     /// Append the results to the CSV-file
                     allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -511,7 +513,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 				}
 				while (!e.Contains(Event.PreviousStopped));
 
-				int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+				int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
                 StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
 
@@ -565,7 +567,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
 				State.Create(string.Format("{0}({1}) : Executing the cycle", test.Method, test.Name))
 					 .AddOperation(checkUiOp)
                      .AddOperations(readTempPressOps)
-                     .AddOperation(new Operations.TimerOp((int)test.TstTime, Event.TimerExpired))
+                     .AddOperation(new Operations.TimerOp((int)test.TestTime, Event.TimerExpired))
                      .AddOperation(cBrd.ExecuteCommandOp(Elde.Command.EnduranceCycleStart, Elde.Command.EnduranceCycleStop, 0))
                      .AddOperation(processDataLoggingOp)
 					 .AddOperation(enduranceDataLoggingOp)
@@ -596,8 +598,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
 
 					UpdateAllStatistics(StateMachine.Time);
 
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 				}
 				while (!e.Contains(Event.TimerExpired) && !e.Contains(Event.Next));
 
@@ -625,8 +627,8 @@ namespace TBF.BenchControl.TestMethods.Endurance
 
 					UpdateAllStatistics(StateMachine.Time);
 
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 				}
                 while (!e.Contains(Event.TimerExpired) && !e.Contains(Event.Next));
 
diff --git a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs
index 3b1882ba4..09ecad5b9 100644
--- a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/Endurance/TestParams.cs b/TBF/BenchControl/TestMethods/Endurance/TestParams.cs
index 069f6908d..3d7f51258 100644
--- a/TBF/BenchControl/TestMethods/Endurance/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStart/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStart/Compound/Component.cs
index 90ee1c866..856eba7b3 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStart.Compound
diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
index da1ea0c15..1252314db 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Common;
 using log4net;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -29,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
                                     bool compound,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
         {
 			int rangeIx = 0;                   /// Default range, used for non-Elde flowmeters
 			if (outPath.FlowMeter is Elde.FlowMeter.FlowMeter)
@@ -72,7 +73,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -135,7 +136,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -149,8 +150,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -169,8 +170,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -205,8 +206,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -232,8 +233,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -247,8 +248,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -264,8 +265,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -407,7 +408,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -517,8 +518,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
             queryEnd1 = cBrd.QueryMeasurementEndOp();
             queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Measurement loop - begin
             do
@@ -587,8 +588,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                     //}
                 }
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (cBrd.EtPulses(0) < totalPulses);
         /// Measurement loop - end
@@ -680,7 +681,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -835,8 +836,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
                         for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
                         {
@@ -858,7 +859,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                             }
                         }
 
-                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
                         if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
                         {
@@ -898,8 +899,8 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-						Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+						Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
 						GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -955,7 +956,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                     {
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
                         GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
                         if (meterRslt != null && regReader != null)
@@ -1010,7 +1011,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
                 Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
             }
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
             /// Append the results to the CSV-file
             allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/Component.cs
index f9b517665..d6c27d86b 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStart.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfgCtrl.cs
index db794400c..af4a10f9e 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestParams.cs
index 7556cedc1..3fe343231 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStart/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStart/Single/Component.cs
index e0a3fff18..99fb98d9d 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStart.Single
diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
index 5b663971e..4ac553672 100644
--- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,7 +29,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition)
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition)
 		{
 			IScale scale = outPath.Scale as IScale;
 			if (scale == null)
@@ -79,7 +81,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -138,8 +140,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 					 .EnterState();
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 					if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -166,7 +168,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 			Bridge.OnActivity(this, Strings.Setting_the_flow);
 			//------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -178,8 +180,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 			}
@@ -193,8 +195,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 			}
@@ -214,8 +216,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 			}
@@ -229,8 +231,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -392,8 +394,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 			queryEnd1 = cBrd.QueryMeasurementEndOp();
 			queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
 			/// Measurement loop - begin
 			do
@@ -427,8 +429,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				RefFlow.Val = cBrd.ReferenceFlow;
 				UpdateAllStatistics(StateMachine.Time);
 
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
 			while (cBrd.EtPulses(0) < totalPulses);
 		/// Measurement loop - end
@@ -611,7 +613,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				{
 					if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-					Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+					Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 					GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
 					if (meterRslt != null && regReader != null)
@@ -665,7 +667,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs
index ebc45baa9..cb6269b5d 100644
--- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Compound/Component.cs
index 25cd4f879..77faae0e5 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval.Compound
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
index fac154138..4808c6e76 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/FixedStartDeferredEvalSeq.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -29,10 +31,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
                                     bool compound,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel,
+									DebugMode debugLevel,
 									out IntermediateData intermediateData)
         {
 			intermediateData = new IntermediateData
@@ -90,7 +92,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -153,7 +155,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -167,8 +169,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -187,8 +189,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -223,8 +225,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -250,8 +252,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -265,8 +267,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -282,8 +284,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -416,7 +418,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
             string fileName = string.Format("{0}-start.bmp", test.Name);
             string[] startImages = new string[sensPath.RegisterReaders.Length];
             ///
-            if (debugLevel != Config.Entities.DebugMode.Simulate)
+            if (debugLevel != DebugMode.Simulate)
 			{
 				State state2 = State.Create(string.Format("{0}({1}) : Grabbing images", test.Method, test.Name))
 									.AddOperation(checkUiOp)
@@ -437,7 +439,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
 
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 					if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -554,8 +556,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
             queryEnd1 = cBrd.QueryMeasurementEndOp();
             queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Measurement loop - begin
             do
@@ -624,8 +626,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
                     //}
                 }
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (cBrd.EtPulses(0) < totalPulses);
         /// Measurement loop - end
@@ -686,7 +688,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
             double flowVolume = 3.6 * LtrPerRefPulse * Convert.ToDouble(endPulses - startPulses) / cBrd.TTime;
             double constMasterCorr = outPath.FlowMeter.LtrPerPulseCorrected(flowVolume, rangeIx);
             double volumeCTV = constMasterCorr * Convert.ToDouble(endPulses - startPulses);
-            if (debugLevel == Config.Entities.DebugMode.Simulate) volumeCTV = test.Volume;
+            if (debugLevel == DebugMode.Simulate) volumeCTV = test.Volume;
             double refEnergy = Energy.Sum * volumeCTV / VolumeForEnergy.Sum;					/// [J]=[J]*[l]/[l]
 
 			///
@@ -698,7 +700,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
             fileName = string.Format("{0}-end.bmp", test.Name);
             string[] endImages = new string[sensPath.RegisterReaders.Length];
             ///
-            if (debugLevel != Config.Entities.DebugMode.Simulate)
+            if (debugLevel != DebugMode.Simulate)
 			{
 
                 State state2 = State.Create(string.Format("{0}({1}) : Grabbing images", test.Method, test.Name))
@@ -720,7 +722,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
 
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 					if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -837,7 +839,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 
 			retVal = Event.MakeSecondPass;
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
             if (stopCycle) retVal = Event.ErrorFlagsStop;
 
@@ -926,8 +928,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -949,7 +951,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -976,7 +978,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
 						if (meterRslt != null && regReader != null)
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/Component.cs
index 9fba799c4..8f345cc85 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
index a1dafec3a..13216154d 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestParams.cs
index 45c18259f..b8e52d707 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Single/Component.cs
index 26ff9e2e4..5dfb22e95 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval.Single
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Compound/Component.cs
index c3a07c8b5..bd3d0550f 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.Compound
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
index b73a77232..5d14afcc5 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/FixedStartMassCollDeferredEvalSeq.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -29,10 +31,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
                                     bool compound,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel,
+									DebugMode debugLevel,
 									out IntermediateData intermediateData)
         {
 			intermediateData = new IntermediateData
@@ -106,7 +108,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -178,7 +180,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 					 .EnterState();
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.JustStarted));
 
 					if (e.Contains(Event.Error))	  { retVal = Event.Error;	  goto stopTest; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -213,7 +215,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.JustStarted));
 
 				if (e.Contains(Event.Error))	  { retVal = Event.Error;	  goto stopTest; }
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -226,7 +228,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -240,8 +242,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -260,8 +262,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -296,8 +298,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -323,8 +325,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -338,8 +340,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -355,8 +357,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -519,7 +521,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
             string fileName = string.Format("{0}-start.bmp", test.Name);
             string[] startImages = new string[sensPath.RegisterReaders.Length];
             ///
-            if (debugLevel != Config.Entities.DebugMode.Simulate)
+            if (debugLevel != DebugMode.Simulate)
 			{
 				State state2 = State.Create(string.Format("{0}({1}) : Grabbing images", test.Method, test.Name))
 									.AddOperation(checkUiOp)
@@ -540,7 +542,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
 
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 					if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -658,8 +660,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
             queryEnd1 = cBrd.QueryMeasurementEndOp();
             queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Measurement loop - begin
             do
@@ -728,8 +730,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
                     //}
                 }
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (cBrd.EtPulses(0) < totalPulses);
         /// Measurement loop - end
@@ -833,7 +835,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
             double buoyancy = Config.Formulas.Buoyancy();
             double massOfEvaporatedWater = (double)(tMass2 - tMass1) * outPath.Scale.EvaporationRate(TempDivStat.Average);
             double volumeCTV = 1000.0 * buoyancy * (massEnd - massStart + massOfEvaporatedWater) / densityOut;
-			if (debugLevel == Config.Entities.DebugMode.Simulate) volumeCTV = test.Volume;
+			if (debugLevel == DebugMode.Simulate) volumeCTV = test.Volume;
 
             double refEnergy = Energy.Sum * volumeCTV / VolumeForEnergy.Sum;					/// [J]=[J]*[l]/[l]
 
@@ -843,7 +845,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
             fileName = string.Format("{0}-end.bmp", test.Name);
             string[] endImages = new string[sensPath.RegisterReaders.Length];
             ///
-            if (debugLevel != Config.Entities.DebugMode.Simulate)
+            if (debugLevel != DebugMode.Simulate)
 			{
 
                 State state2 = State.Create(string.Format("{0}({1}) : Grabbing images", test.Method, test.Name))
@@ -865,7 +867,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
 
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 					if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -983,7 +985,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 
 			retVal = Event.MakeSecondPass;
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
             if (stopCycle) retVal = Event.ErrorFlagsStop;
 
@@ -1072,8 +1074,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -1095,7 +1097,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -1122,7 +1124,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(data.TestName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
 						if (meterRslt != null && regReader != null)
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/Component.cs
index fd66c4da5..5b9d5e22a 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
index 96c5b040d..a390a71b2 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestParams.cs
index d2bb836d3..ab71f8770 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Single/Component.cs
index 80ef00cee..1c4339d53 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.Single
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs
index 3d30e4513..7f70a7377 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Compound
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 0fb32e6a1..ddfe4a02d 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using log4net;
+using Common;
 using TBF.Resources;
 using TBF.UiBridge;
 using TBF.BenchControl.GenericDevices;
@@ -29,7 +30,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
                                     bool compound,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
         {
 			IScale scale = outPath.Scale as IScale;
 			if (scale == null)
@@ -87,7 +88,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -160,7 +161,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 					 .EnterState();
 				do {
 					e = StateMachine.WaitRunDevsRunOps();
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.JustStarted));
 
 					if (e.Contains(Event.Error))	  { retVal = Event.Error;	  goto stopTest; }
 					if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -195,7 +196,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.JustStarted));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.JustStarted));
 
 				if (e.Contains(Event.Error))	  { retVal = Event.Error;	  goto stopTest; }
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -208,7 +209,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -222,8 +223,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -242,8 +243,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -278,8 +279,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -305,8 +306,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -320,8 +321,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -337,8 +338,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -527,7 +528,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -637,8 +638,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             queryEnd1 = cBrd.QueryMeasurementEndOp();
             queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Measurement loop - begin
             do {
@@ -703,8 +704,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
                 #endregion
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (cBrd.EtPulses(0) < totalPulses);
         /// Measurement loop - end
@@ -822,7 +823,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
             double buoyancy = Config.Formulas.Buoyancy();
             double massOfEvaporatedWater = (double)(tMass2 - tMass1) * outPath.Scale.EvaporationRate(TempDivStat.Average);
             double volumeCTV = 1000.0 * buoyancy * (massEnd - massStart + massOfEvaporatedWater) / densityOut;
-			if (debugLevel == Config.Entities.DebugMode.Simulate) volumeCTV = test.Volume;
+			if (debugLevel == DebugMode.Simulate) volumeCTV = test.Volume;
 
             double refEnergy = Energy.Sum * volumeCTV / VolumeForEnergy.Sum;					/// [J]=[J]*[l]/[l]
 
@@ -854,7 +855,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -1010,8 +1011,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
                         for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
                         {
@@ -1033,7 +1034,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                             }
                         }
 
-                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
                         if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
                         {
@@ -1073,8 +1074,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-						Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+						Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
 						GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -1130,7 +1131,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
                         GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
                         if (meterRslt != null && regReader != null)
@@ -1185,7 +1186,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
                 Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
             }
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
             /// Append the results to the CSV-file
             allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs
index c7e670879..e88059ac3 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
index a8cdc218f..983296527 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs
index ccce54f11..1e3c93801 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs
index 0a203296b..63da32089 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.Single
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/Component.cs
index 36d46d69f..38e04d08d 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Compound
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfgCtrl.cs
index 7323f267a..2365f1d3a 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestParams.cs
index 839f2b64f..5b9779a0b 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
index 06b7bba34..121570952 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/FixedStartTankCollectionSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.Resources;
 using TBF.UiBridge;
 using TBF.BenchControl.GenericDevices;
@@ -27,10 +29,10 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
                                     Single.TestParams singleTestParams,
                                     Compound.TestParams compoundTestParams,
-                                    Config.Entities.DebugMode debugLevel)
+                                    DebugMode debugLevel)
         {
             if ((outPath.Scale == null) || !(outPath.Scale is IVolumeMeter))
 			{
@@ -87,7 +89,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -152,7 +154,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -165,8 +167,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -184,8 +186,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -218,8 +220,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -244,8 +246,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -258,8 +260,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
             }
@@ -274,8 +276,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
@@ -371,7 +373,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -472,8 +474,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
             queryEnd1 = cBrd.QueryMeasurementEndOp();
             queryEnd2 = cBrd.QueryMeasurementEndOp();
 
-            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TestTime / 10), 5));
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
 
             /// Measurement loop - begin
             do
@@ -523,8 +525,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                     //}
                 }
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (cBrd.EtPulses(0) < totalPulses);
         /// Measurement loop - end
@@ -630,7 +632,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
 					do {
 						e = StateMachine.WaitRunDevsRunOps();
 
-						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+						Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 						if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 						if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
@@ -754,8 +756,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+                        Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+                        Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
                         for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
                         {
@@ -777,7 +779,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                             }
                         }
 
-                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+                        Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
                         if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
                         {
@@ -804,7 +806,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                        Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
                         GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
                         if (meterRslt != null && regReader != null)
@@ -859,7 +861,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection
                 Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
             }
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
             /// Append the results to the CSV-file
             allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/Component.cs
index f5e7694f6..e37719372 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Single
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfgCtrl.cs
index 1b6c1e7d6..79ec991cc 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestParams.cs
index 1993af890..77424187b 100644
--- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs
index 5b511d732..9ce5078c1 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStart.Compound
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs
index 73e58ec66..0eacaa5b1 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs
index 0d21bbd5a..7b56f01cf 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index a92e8783b..39c49a8e0 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,12 +29,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
 									Compound.TestParams compoundTestParams,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
             {
 				return Simulate(test, repetitionNr, isLastRepetition, compoundTestParams, heatMetersTestParams, debugLevel);
             }
@@ -80,7 +82,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -142,8 +144,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -161,8 +163,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -197,8 +199,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -220,8 +222,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e))		 { retVal = Event.UiCmdStop; goto stopTest; }
@@ -380,7 +382,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
             readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
             queryEnd1 = cBrd.QueryMeasurementEndOp();
 
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
             /// Measurement loop - begin
@@ -434,8 +436,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                     }
                 }
 
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
 			while (true);
 		/// Measurement loop - end
@@ -530,8 +532,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
                         BenchControl.GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -588,7 +590,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -727,7 +729,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -780,12 +782,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
         IList<Event> Simulate(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
                               Compound.TestParams compoundTestParams,
                               HeatMeters.TestParams heatMetersTestParams,
-                              Config.Entities.DebugMode debugLevel)
+                              DebugMode debugLevel)
         {
             ///
             /// Test method simulation
             /// 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
             if (compoundTestParams != null)
             {
@@ -801,7 +803,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
             else if (test.Name.ToLower().Contains("q1")) MakeSimulated(test, 1, 0, -5.1f);
             else MakeSimulated(test, 1, 0, 0.9f);
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
             Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
             allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs
index f41531054..ff64bbc20 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs
index 11c2a5a65..926ac0199 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs
index 2762c399e..4ef7ea9ce 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs
index ec40c271a..dd5965ea4 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStart.Single
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs
index c10a4035b..3240ad160 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compound
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs
index 914a9e658..829d9a63c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs
index b2509953d..511adcd43 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
index b32076e8d..3a6674f6f 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,13 +29,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
                                     Single.TestParams singleTestParams,
                                     Compound.TestParams compoundTestParams,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
 			{
 				return Simulate(test, repetitionNr, isLastRepetition, singleTestParams, compoundTestParams, heatMetersTestParams);
 			}
@@ -96,7 +98,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -213,7 +215,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -227,8 +229,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -246,8 +248,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -282,8 +284,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -304,8 +306,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError))	 { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e))		 { retVal = Event.UiCmdStop; goto stopTest; }
@@ -553,7 +555,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
             readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
             queryEnd1 = cBrd.QueryMeasurementEndOp();	/// ???
 
-			int estimtdEndTime = StateMachine.Time + (int)((repetitionNr == 1) ? test.TstTime : (test.TstTime * nextTestVolume / test.Volume));
+			int estimtdEndTime = StateMachine.Time + (int)((repetitionNr == 1) ? test.TestTime : (test.TestTime * nextTestVolume / test.Volume));
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
             /// Measurement loop - begin
@@ -609,8 +611,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                     }
                 }
 
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             }
             while (!e.Contains(Event.Next));	/// 'Next' button can be used in Debug version
 
@@ -836,8 +838,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -868,7 +870,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -908,8 +910,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
                         BenchControl.GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -966,7 +968,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -1067,7 +1069,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -1108,7 +1110,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 			///
 			/// Test method simulation
 			/// 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 			if (compoundTestParams != null)
 			{
@@ -1129,7 +1131,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
 				MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f);
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
 			allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs
index 03751992f..d92acf07c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs
index 14312da18..668eecc97 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs
index b97326929..ae1374832 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs
index bf051853e..77234d147 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Single
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs
index c4401ebe9..98f05f647 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs
index 0ead433d6..41a1d73c1 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/Component.cs
index 7915f56bf..584e082d8 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.TestMethods.FlyingStartMassCollComparative;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfgCtrl.cs
index e55caf773..04c420622 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestParams.cs
index ec4a3a68b..5dcde0a7c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
index 77579c847..edf125db9 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/FlyingStartMassCollComparativeSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -31,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                                     Single.TestParams singleTestParams,
                                     Compound.TestParams compoundTestParams,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
 			IScale scale = outPath.Scale as IScale;
 			if (scale == null)
@@ -117,7 +118,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -226,7 +227,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -240,8 +241,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -259,8 +260,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -295,8 +296,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -317,8 +318,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))  { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e))       { retVal = Event.UiCmdStop; goto stopTest; }
@@ -659,7 +660,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 			/// Measurement loop - preparation
             readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
 
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
             /// Measurement loop - begin
@@ -715,8 +716,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                     }
                 }
 
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
             while (!e.Contains(Event.Next));	/// 'Next' button can be used in Debug version
 
@@ -917,8 +918,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -949,7 +950,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -989,8 +990,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
                         BenchControl.GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -1048,7 +1049,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
 						/// MetersKind.Single meters
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -1171,7 +1172,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/Component.cs
index 0188fe594..a3cd05f50 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfgCtrl.cs
index 8d7fc0d09..03355e659 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestParams.cs
index 6007f2c77..b4d5595e6 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/Component.cs
index 6495de081..6643e90a3 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.Single
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfgCtrl.cs
index 2728a92f6..59417660b 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestParams.cs
index 52cbbcce3..3dc380d5e 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs
index d1f4f16ac..6bcb054db 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs
index b3e4235b4..7f54f0d26 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs
index 0abc6eecf..498be4022 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
index 03eae7630..4bceea010 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -29,9 +30,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                                     Single.TestParams singleTestParams,
                                     Compound.TestParams compoundTestParams,
 									HeatMeters.TestParams heatMetersTestParams,
-                                    Config.Entities.DebugMode debugLevel)
+                                    DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
 			{
 				return Simulate(test, repetitionNr, isLastRepetition, singleTestParams, compoundTestParams, heatMetersTestParams);
 			}
@@ -100,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -212,7 +213,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -226,8 +227,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -245,8 +246,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -281,8 +282,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -303,8 +304,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))  { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e))       { retVal = Event.UiCmdStop; goto stopTest; }
@@ -549,7 +550,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
             ///
             /// Measurement loop - preparation
             ///
-            int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+            int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
             bool isMeasurementCompleted = false;
 
@@ -864,8 +865,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -896,7 +897,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -936,8 +937,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
                         BenchControl.GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -995,7 +996,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
 						/// MetersKind.Single meters
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -1141,7 +1142,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -1192,8 +1193,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
             UpdateEnergy(heatMetersTestParams);
             if (showRemainingTimeMsg) ShowRemainingTime(Math.Max(estimtdEndTime - StateMachine.Time, 0));
 
-            Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+            Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
         }
 
 
@@ -1231,7 +1232,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
 			///
 			/// Test method simulation
 			/// 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 			if (compoundTestParams != null)
 			{
@@ -1252,7 +1253,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
                 MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f);
             }
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
 			allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs
index fcf756e7a..2a9e7361c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs
index ee72dfd1d..89634791c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs
index c7b91ffec..22a3cc9c5 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs
index c22d371de..f861348f4 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs
index df905a415..07c8ea07d 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs
index 891597579..b93d85a4c 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs
index 6be9accab..a7e4d88ef 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/CombinedTestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs
index 5cd83105c..04bd5c6f3 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.TestMethods.FlyingStartMassCollection;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs
index af901f388..98688ad91 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index 21b7b79a5..591f7e063 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
 using TBF.Resources;
@@ -27,16 +29,16 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
 									Compound.CombinedTestParams compoundTestParams,
 									HeatMeters.TestParams heatMetersTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
 			{
 				return Simulate1(test, repetitionNr, isLastRepetition, compoundTestParams, heatMetersTestParams);
 			}
-			else if (debugLevel == Config.Entities.DebugMode.Inherit)
+			else if (debugLevel == DebugMode.Inherit)
 			{
 				return Simulate2(test, repetitionNr, isLastRepetition, compoundTestParams, heatMetersTestParams);
 			}
@@ -98,7 +100,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if(benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -207,7 +209,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -221,8 +223,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -240,8 +242,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 	 				 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -276,8 +278,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -298,8 +300,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))  { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e))       { retVal = Event.UiCmdStop; goto stopTest; }
@@ -543,7 +545,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			/// Measurement loop - preparation
             readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
 
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
             /// Measurement loop - begin
@@ -599,8 +601,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                     }
                 }
 
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
             while (!e.Contains(Event.Next));	/// 'Next' button can be used in Debug version
 
@@ -790,8 +792,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -822,7 +824,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -862,8 +864,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                     {
                         if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterVolume);
-                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.HeatMeterEnergy);
+                        Results.Entities.MeterTestRslt volumeRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterVolume);
+                        Results.Entities.MeterTestRslt energyRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.HeatMeterEnergy);
 
                         BenchControl.GenericDevices.IRegReader volumeRegReader =
                             (sensPath.RegisterReaders.Length > 2 * i) ? sensPath.RegisterReaders[2 * i] : null;
@@ -921,7 +923,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
 						/// MetersKind.Single meters
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -1088,7 +1090,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -1134,7 +1136,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			///
 			/// Test method simulation
 			/// 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
             foreach (var rr in sensPath.RegisterReaders)
             {
@@ -1174,7 +1176,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
                 MakeSimulated(test, repetitionNr, test.Part, errorPctBase + repetitionNr * 0.1f);
             }
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
 			Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
 			allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
@@ -1201,23 +1203,23 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			///
 			/// Test method with flow chart simulation
 			/// 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 
 			/// Simulate flow
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
-			IntBox remainingTime = new IntBox((int)test.TstTime);
+			IntBox remainingTime = new IntBox((int)test.TestTime);
 			State.Create(string.Format("{0}({1}) : Simulation", test.Method, test.Name))
 					.AddOperation(checkUiOp)
-					.AddOperation(new Operations.TimerOp((int)test.TstTime, remainingTime))
+					.AddOperation(new Operations.TimerOp((int)test.TestTime, remainingTime))
 					.EnterState();
 			do
 			{
 				e = StateMachine.WaitRunDevsRunOps();
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
 
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 				if (remainingTime.Val > 60)
 				{
@@ -1229,7 +1231,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 				}
 				//------------------------------------------------
 
-				RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TstTime)) * (test.Qfrom + test.Qto) / 2.0;
+				RefFlow.Val = (1.0 + 0.2 * Math.Sin(2 * Math.PI * (float)remainingTime.Val / test.TestTime)) * (test.Qfrom + test.Qto) / 2.0;
                 PressUp.Val = 2.7f;
                 PressDown.Val = 2.2f;
 
@@ -1249,7 +1251,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 
 				MakeSimulated(test, repetitionNr, test.Part, errorPctBase + repetitionNr * 0.1f);
 
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
 				allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 			}
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs
index 55311f005..8a5be6610 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
index 08942704e..c940ebf68 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs
index d5184bdf2..14379a738 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs
index 031abd9d6..05cac5f24 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Sequences;
 using TBF.UiBridge;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/Component.cs
index 0d95676ee..253fa7b99 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Compound
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfgCtrl.cs
index e93550357..fb0d9abcb 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestParams.cs
index 149cafda1..43c3068f9 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
index f17fd7b3d..0ee080a22 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/FlyingStartTankCollectionSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.Boxes;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -28,9 +29,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
                                     Single.TestParams singleTestParams,
                                     Compound.TestParams compoundTestParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-            if (debugLevel == Config.Entities.DebugMode.Simulate)
+            if (debugLevel == DebugMode.Simulate)
             {
                 return Simulate(test, repetitionNr, isLastRepetition, singleTestParams, compoundTestParams);
             }
@@ -93,7 +94,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -149,7 +150,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
             Bridge.OnActivity(this, Strings.Starting_the_pump);
             //------------------------------------------------
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
 			if (inPath.Pump is GenericDevices.IPumpFM) (inPath.Pump as GenericDevices.IPumpFM).TurnOn(test.PumpPower);
@@ -162,8 +163,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -180,8 +181,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -214,8 +215,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 					 .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -235,8 +236,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				 .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))  { retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test, e))       { retVal = Event.UiCmdStop; goto stopTest; }
@@ -352,7 +353,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 			/// Measurement loop - preparation
             readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
 
-			int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
+			int estimtdEndTime = StateMachine.Time + (int)test.TestTime;
             StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
 
             /// Measurement loop - begin
@@ -388,8 +389,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 
 				UpdateAllStatistics(StateMachine.Time);
 
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 			}
             while (!e.Contains(Event.Next));	/// 'Next' button can be used in Debug version
 
@@ -549,8 +550,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 					{
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -581,7 +582,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null && mainMeterRslt != null && auxMeterRslt != null)
 						{
@@ -609,7 +610,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 						if (!test.IsPartCompatible(Utils.PartNr(i + 1, BatchRslts.Batch.Compound))) continue;
 
 						/// MetersKind.Single meters
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 						GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
                         GenericDevices.IRegReaderDatastream dstrReader = regReader as GenericDevices.IRegReaderDatastream;
                         TestMethods.iPerlCommunication.iPerlHead.IperlHead iPerl = regReader as TestMethods.iPerlCommunication.iPerlHead.IperlHead;
@@ -732,7 +733,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -782,7 +783,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
 
             bool manualLevelMsrmnt = (singleTestParams != null) ? singleTestParams.ManualLevelMsrmnt : compoundTestParams.ManualLevelMsrmnt;
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
             IList<Event> e = new List<Event>();             /// Events from currently running operations
             Event retVal = Event.Done;
@@ -819,7 +820,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection
                 MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f);
             }
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Completed));
             Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0)));
             allResults.Info(TestResult2CsvLine(test.Name, 0));	/// Append the results to the CSV-file
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/Component.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/Component.cs
index cdf6357f0..fe1924e2e 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/Component.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Single
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfgCtrl.cs
index 4d7a14eac..880afa656 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestParams.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestParams.cs
index f9d8a2fa5..d4b3fd9ab 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/GrabImage/Component.cs b/TBF/BenchControl/TestMethods/GrabImage/Component.cs
index 72e9fc993..20ff7773b 100644
--- a/TBF/BenchControl/TestMethods/GrabImage/Component.cs
+++ b/TBF/BenchControl/TestMethods/GrabImage/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs
index cbe45dcec..a5eeba4e7 100644
--- a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs
+++ b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Serialization;
-using Config.Entities;
+using Common;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
 
diff --git a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs
index 9520b6052..939188ca4 100644
--- a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs
index e9c9d91ae..a59e4a23f 100644
--- a/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs
+++ b/TBF/BenchControl/TestMethods/GrabImage/GrabImageSeq.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 using System.IO;
@@ -14,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.GrabImage
 		private static readonly ILog log = LogManager.GetLogger(typeof(GrabImageSeq));
 
 
-		public IList<Event> Execute( Test test, GrabImageCfg cfg)
+		public IList<Event> Execute(Test test, GrabImageCfg cfg)
 		{
 			IList<Event> e = new List<Event>();             /// Events from currently running operations
             Event retVal = Event.Done;
@@ -48,14 +49,14 @@ namespace TBF.BenchControl.TestMethods.GrabImage
 			{
 				e = StateMachine.WaitRunDevsRunOps();
 
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Test));
 
 				if (e.Contains(Event.Error))	  { retVal = Event.Error;	  break; }
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
 			}
             while (e.Contains(Event.CameraBusy));
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
             return new List<Event> { retVal };
         }
     }
diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs
index b699bf804..5591beaed 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
index fb9071561..cf3f27c08 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
@@ -28,7 +29,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition, LeakTestParams testParams)
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition, LeakTestParams testParams)
 		{
             if ((testParams.MaxPressureDrop != 0) && (benchPath.PressMtrDown == null))
             {
@@ -98,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Setting_the_water_pressure);
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
             //------------------------------------------------
 
 			float pumpPower = test.PumpPower;
@@ -152,7 +153,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_in_progress);
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             //------------------------------------------------
 			State.Create(string.Format("{0}({1}) : Maximum water pressure set", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
@@ -402,7 +403,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
                     if (StateMachine.Procedure.MetersKind == MetersKind.Single)
 					{
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 
 						if (meterRslt != null)
 						{
@@ -415,8 +416,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 					}
 					else
 					{
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -430,7 +431,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null)
 						{
@@ -457,7 +458,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -466,7 +467,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 			StopRecordingStatistics();
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			///
 			///  Quit this sequence
diff --git a/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
index 442334aee..f9445b13d 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Sequences;
diff --git a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs
index 24803f718..911ef99c2 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs b/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs
index d41987f01..48f327cd8 100644
--- a/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/LiveStream/CfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/LiveStream/Component.cs b/TBF/BenchControl/TestMethods/LiveStream/Component.cs
index 60b7c2e9b..513896c98 100644
--- a/TBF/BenchControl/TestMethods/LiveStream/Component.cs
+++ b/TBF/BenchControl/TestMethods/LiveStream/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs
index 754be9d42..0b4d364d8 100644
--- a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs
+++ b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamSeq.cs
@@ -3,6 +3,7 @@
 ///
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 
@@ -49,14 +50,14 @@ namespace TBF.BenchControl.TestMethods.LiveStream
 			{
 				e = StateMachine.WaitRunDevsRunOps();
 
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Test));
 
 				if (e.Contains(Event.Error)) { retVal = Event.Error; break; }
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; break; }
 			}
             while (!e.Contains(Event.OK));
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
             return new List<Event> { retVal };
         }
     }
diff --git a/TBF/BenchControl/TestMethods/ManualEntry/Component.cs b/TBF/BenchControl/TestMethods/ManualEntry/Component.cs
index 37bd02fcd..cdde1d416 100644
--- a/TBF/BenchControl/TestMethods/ManualEntry/Component.cs
+++ b/TBF/BenchControl/TestMethods/ManualEntry/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfgCtrl.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfgCtrl.cs
index 597b0160a..5f28e7291 100644
--- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs
index 4c19b93c1..9f3cb8bdd 100644
--- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs
+++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntrySeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using Results;
 using Results.Entities;
diff --git a/TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs b/TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs
index 1b6263fa2..38971a533 100644
--- a/TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs
+++ b/TBF/BenchControl/TestMethods/OuterLoop/End/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.OuterLoop.End
diff --git a/TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs b/TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs
index 9dbfaed56..7ef65f261 100644
--- a/TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs
+++ b/TBF/BenchControl/TestMethods/OuterLoop/Start/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.OuterLoop.Start
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs
index 49c6c87aa..4027e5c35 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
index c93c14fc6..463d8591f 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -24,7 +25,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition, PMaxTestParams testParams)
+		public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition, PMaxTestParams testParams)
 		{
             IList<Event> e;                             /// Events from currently running operations
             Event retVal = Event.Done;
@@ -82,7 +83,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Setting_the_water_pressure);
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
             //------------------------------------------------
 
 			float pumpPower = test.PumpPower;
@@ -151,7 +152,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Test_in_progress);
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
             //------------------------------------------------
             State.Create(string.Format("{0}({1}) : Starting the test", test.Method, test.Name))
 				 .AddOperation(checkUiOp)
@@ -226,7 +227,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
                     if (StateMachine.Procedure.MetersKind == MetersKind.Single)
 					{
-						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+						Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 
 						if (meterRslt != null)
 						{
@@ -239,8 +240,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 					}
 					else
 					{
-						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundMain);
-						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.CompoundAux);
+						Results.Entities.MeterTestRslt mainMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundMain);
+						Results.Entities.MeterTestRslt auxMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.CompoundAux);
 
 						for (int isAux = 0; isAux <= 1; isAux++)		/// 0=main, 1=aux
 						{
@@ -254,7 +255,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 							}
 						}
 
-						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Compound);
+						Results.Entities.MeterTestRslt compoundMeterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Compound);
 
 						if (compoundMeterRslt != null)
 						{
@@ -281,7 +282,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
@@ -290,7 +291,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
 			StopRecordingStatistics();
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			///
 			///  Quit this sequence
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
index bfaa2f230..da2b55270 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Sequences;
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs
index d72e2b58a..29c8a6e84 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
index 12d64b4a3..21ef10edb 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
@@ -100,7 +101,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -133,7 +134,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
             }
             while (e.Contains(Event.Busy));
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
             TestStartTime = DateTime.Now;
             int flowSetTime0 = StateMachine.Time;
 
@@ -150,8 +151,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -169,8 +170,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -203,8 +204,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -224,8 +225,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e))		 { retVal = Event.UiCmdStop; goto stopTest; }
@@ -315,7 +316,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_in_progress);
 			//------------------------------------------------
-			if (mode == Config.Entities.DebugMode.Simulate)
+			if (mode == DebugMode.Simulate)
 			{
 				/// TODO: Reimplement
 				//tstRslt = MakeSimulated(test, 1, simulatedError);
@@ -370,8 +371,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 					RefFlow.Val = cBrd.ReferenceFlow;
 					UpdateAllStatistics(StateMachine.Time);
 
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 				}
 			/// Measurement loop - end
 
@@ -495,7 +496,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
 			}
 			modelessDlg = null;		    /// Modeless dialog is closed now
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethod.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestMethod.cs
index 755be041f..2da8a14c2 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestParams.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestParams.cs
index e1ae198b8..55d17b77b 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm.cs b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm.cs
index 92bb18452..5044a132c 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.PulsesTest
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm12.cs b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm12.cs
index 268a53866..5c5112968 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm12.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm12.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.PulsesTest
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm24.cs b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm24.cs
index 66267df73..36e8e5738 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm24.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/WMPulsesForm24.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
-using Config.Entities;
+using Common;
 using TBF.Resources;
 
 namespace TBF.BenchControl.TestMethods.PulsesTest
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
index 950336297..15ead726f 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.Boxes;
@@ -101,7 +102,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -136,7 +137,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 			string testName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
 			TestStartTime = DateTime.Now;
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 			int flowSetTime0 = StateMachine.Time;
 
             //------------------------------------------------
@@ -152,8 +153,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
                  .EnterState();
             do {
                 e = StateMachine.WaitRunDevsRunOps();
-                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -171,8 +172,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -205,8 +206,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -226,8 +227,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (e.Contains(Event.OpArgumentError)) { retVal = Event.OpArgumentError; goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e))		 { retVal = Event.UiCmdStop; goto stopTest; }
@@ -317,7 +318,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Test_in_progress);
 			//------------------------------------------------
-			if (mode == Config.Entities.DebugMode.Simulate)
+			if (mode == DebugMode.Simulate)
 			{
 				/// TODO: Reimplement
 				//tstRslt = MakeSimulated(test, 1, simulatedError);
@@ -372,8 +373,8 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 					RefFlow.Val = cBrd.ReferenceFlow;
 					UpdateAllStatistics(StateMachine.Time);
 
-					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
-					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+					Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.Test));
+					Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 				}
 			/// Measurement loop - end
 
@@ -493,7 +494,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
 			}
 			modelessDlg = null;		/// Modeless dialog is closed now
 
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/TestMethod.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/TestMethod.cs
index c905239d4..7f1fca4a3 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/Component.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/Component.cs
index cbaedb037..7eb9b2e09 100644
--- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/Component.cs
+++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/Component.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 
 namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfgCtrl.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfgCtrl.cs
index 2a522fd8a..3b3d4e6d1 100644
--- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfgCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs
index 569e854bc..f354d0fd2 100644
--- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs
+++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistorySeq.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NHibernate;
 using log4net;
+using Common;
 using Results.Entities;
 using RestClient;
 using TBF.UiBridge;
@@ -19,7 +20,7 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
 
 		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, FromHistoryCfg cfg)
 		{
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Test));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Test));
 
             bool success = false;
 
@@ -55,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
                 tstRslt.TestDone = true;
 				for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
 				{
-                    MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                    MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
                     if (meterRslt != null)
                     {
                         meterRslt.TestDone = true;
@@ -68,7 +69,7 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory
             {
                 Bridge.OnError(this, "Q2 pre-correction sa nedá načítať");
             }
-            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Config.Entities.Progress.Completed));
+            Bridge.OnTestProgress(this, new TestProgressEventArgs(test, 1, Progress.Completed));
 
             return new List<Event> { success ? Event.Done : Event.RecoverableError };
         }
diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs
index 29046716b..579e92c42 100644
--- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs
+++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetection.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs
index 50e163d64..a4dbf24d3 100644
--- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
index d356cd363..e126d4822 100644
--- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -63,7 +64,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
 				if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 				if (e.Contains(Event.Error)) { retVal = Event.Error; goto stopTest; }
@@ -80,8 +81,8 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -114,8 +115,8 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
                      .EnterState();
                 do {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+                    Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                     if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
                 }
@@ -135,7 +136,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
                 if (e.Contains(Event.OpArgumentError))	{ retVal = Event.OpArgumentError; goto stopTest; }
                 if (TestAndLogUiCmdStop(test,e))		{ retVal = Event.UiCmdStop;		  goto stopTest; }
@@ -193,7 +194,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
 
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Test));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.Test));
 
 				if (e.Contains(Event.Error))     { retVal = Event.Error;     goto stopTest; }
 				if (TestAndLogUiCmdStop(test,e)) { retVal = Event.UiCmdStop; goto stopTest; }
diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
index df371f2e9..79e0763b8 100644
--- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using log4net;
+using Common;
+using Config.Entities;
 using TBF.BenchControl;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -28,11 +30,11 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
         /// <param name="testParams">The test parameters.</param>
         /// <param name="debugLevel">The debug level.</param>
         /// <returns></returns>
-        public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, bool isLastRepetition,
+        public IList<Event> Execute(Test test, int repetitionNr, bool isLastRepetition,
 									TestParams testParams,
-									Config.Entities.DebugMode debugLevel)
+									DebugMode debugLevel)
 		{
-			if (debugLevel == Config.Entities.DebugMode.Simulate)
+			if (debugLevel == DebugMode.Simulate)
 			{
                 return new List<Event> { Event.Done };  /// TODO: Test method simulation
 			}
@@ -79,7 +81,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
                 }
             }
 
-            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.TolerRed == 0) ? 0 : 1);
+            cBrd.SetFiltersPidShortPulses(filters, outPath.PidCoef, (test.ShortPulses == 0) ? 0 : 1);
 
             IList<IOperation> readTempPressOps = new List<IOperation>();
             if (benchPath.TempMtrUp != null) readTempPressOps.Add(benchPath.TempMtrUp.ReadTempOp(ref TempUp));
@@ -196,7 +198,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
 				if (TestAndLogUiCmdStop(test,e)) goto stopTest;
 			}
@@ -207,11 +209,11 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 				 .AddOperation(checkUiOp)
                  .AddOperations(readTempPressOps)
                  .AddOperations(measureOperations)
-                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.TolerRed))
+                 .AddOperation(outPath.RegulValve.SetFlowAndMeasureOp(outPath.FlowMeter, test.Qfrom, test.Qto, RefFlow, FlowSettingTimeoutSec, (float)test.ShortPulses))
 				 .EnterState();
 			do {
 				e = StateMachine.WaitRunDevsRunOps();
-				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+				Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
                 if (TestAndLogUiCmdStop(test, e)) { retVal = Event.UiCmdStop; goto stopTest; }
 				if (e.Contains(Event.RegulValveTimeOut))
@@ -265,7 +267,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
             bool targetReached = false;
 
 			int detectionStartTime = StateMachine.Time;
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
 			do
             {
@@ -279,7 +281,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
                 do
                 {
                     e = StateMachine.WaitRunDevsRunOps();
-                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.SwitchingFlowDetection));
+                    Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.SwitchingFlowDetection));
 
                     if (TestAndLogUiCmdStop(test, e)) goto stopTest;
                 }
@@ -415,8 +417,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 
             int flowSetTime1 = StateMachine.Time;
 
-			Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.FlowSetting));
+			Bridge.OnProcessData(this, new ProcessDataEventArgs(test, repetitionNr, Progress.FlowSetting));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.FlowSetting));
 
             //--------------------------------
             //State.Create(string.Format("{0}({1}) : Flow sensitivity detected", test.Method, test.Name))
@@ -499,7 +501,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 
                 for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
                 {
-                    Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, Config.Entities.CompoundMeterId.Single);
+                    Results.Entities.MeterTestRslt meterRslt = BatchRslts.GetMeterTestRslt(testName, i, CompoundMeterId.Single);
 
 					GenericDevices.IRegReader regReader = sensPath.RegisterReaders[i];
 
@@ -545,7 +547,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest
 				Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
 			}
 
-			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.TransitionAfter));
+			Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Progress.TransitionAfter));
 
 			/// Append the results to the CSV-file
 			allResults.Info(TestResult2CsvLine(testName, test.Part));
diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs
index d99b9099b..0b487c8bb 100644
--- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethod.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 
diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs
index cbfd43932..4981fe623 100644
--- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs
index 1636dff06..d2144591e 100644
--- a/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs
+++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs
index 685f8fa2a..b188d3fbe 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethod.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO.Ports;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl;
 using TBF.BenchControl.Sequences;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs
index e13b0fab0..c027a1275 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index 6ae117914..40b5622fb 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -13,6 +13,7 @@ using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config;
 using Config.Entities;
 using TBF.Resources;
@@ -3179,7 +3180,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 					for (int i = 0; i < iperlHeads.Count; i++)
 					{
 						Results.Entities.MeterTestRslt meterRslt =
-							ProcessData.BatchRslts.GetMeterTestRslt(test.Name, waterMeterPositions0[i], Config.Entities.CompoundMeterId.Single);
+							ProcessData.BatchRslts.GetMeterTestRslt(test.Name, waterMeterPositions0[i], CompoundMeterId.Single);
 
 						if (meterRslt != null && iperlHeads[i] != null)
 						{
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs
index 5e1d6895b..6f16a5346 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
index f82c5ce8d..c601cbef3 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;                   /// Point definition
 using log4net;
+using Common;
 using Config.Entities;
 using RestClient;
 using TBF.BenchControl.Sequences;
@@ -46,7 +47,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 		///		Event.OpArgumentError  . Target flow is out of range
 		///		Event.Error  . . . . . . Unspecified error
 		/// </returns>
-		public IList<Event> Execute(Config.Entities.Test test, int repetitionNr, TestMethodCfg cfg, iPerlCommunicationParams testParams)
+		public IList<Event> Execute(Test test, int repetitionNr, TestMethodCfg cfg, iPerlCommunicationParams testParams)
 		{
             IList<Event> e;                                 /// Events from currently running operations
             checkUiOp = new Operations.CheckUIOp(true);     /// Runs in more then one state
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/FlowDirectionDetection.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/FlowDirectionDetection.cs
index 3642926b8..49cc4a511 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/FlowDirectionDetection.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/FlowDirectionDetection.cs
@@ -3,7 +3,7 @@
 ///
 using System;
 using log4net;
-using Config.Entities;
+using Common;
 
 namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead
 {
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
index e31c03b7c..bef9329d0 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.IO.Ports;
 using log4net;
+using Common;
 using Common.Iperl;
 using Config.Entities;
 using TBF.BenchControl.Generic;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs
index 8deaabc1c..471c013f9 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfgCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Net;
 using System.Net.Sockets;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs
index a80ef4cda..0efb82eef 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/ProcParams.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using System.Collections.Generic;
diff --git a/TBF/BenchControl/Various/ErrorFlags/Errors.cs b/TBF/BenchControl/Various/ErrorFlags/Errors.cs
index 03436acbc..63f398914 100644
--- a/TBF/BenchControl/Various/ErrorFlags/Errors.cs
+++ b/TBF/BenchControl/Various/ErrorFlags/Errors.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using log4net;
-using Config.Entities;
+using Common;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
 
diff --git a/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs
index 63858a28c..bd10f6942 100644
--- a/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs
+++ b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 
diff --git a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
index a6abbd83c..868aeb13d 100644
--- a/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
+++ b/TBF/BenchControl/Various/ErrorFlags/TestParams.cs
@@ -3,6 +3,7 @@
 ///
 using System.IO;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs b/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs
index 0064c31c1..8685b9893 100644
--- a/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs
+++ b/TBF/BenchControl/Various/StatisticsMonitoring/ProcessStatistics.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using log4net;
 using NHibernate;
+using Common;
 using Events.Entities;
 using Results.Entities;
 
diff --git a/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs b/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs
index 5a23b013c..2cc834694 100644
--- a/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs
+++ b/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs
index b9c552d75..5de56c525 100644
--- a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs
+++ b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs b/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs
index afdefd1d5..cf8dd2ace 100644
--- a/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs
+++ b/TBF/BenchControl/WaterMeters/Munich/ProcParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs
index 41df7f6ac..564ee5656 100644
--- a/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs
+++ b/TBF/BenchControl/WaterMeters/Munich/WaterMeter.cs
@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using log4net;
+using Common;
 using TBF.BenchControl;
-using Config.Entities;
 
 namespace TBF.BenchControl.WaterMeters.Munich
 {
@@ -31,7 +31,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
         /// <summary>Build lenght [mm]</summary>
         public float L { get { return 0; } }
 
-        public Mounting Mounting { get { return Config.Entities.Mounting.NotSpecified; } }
+        public Mounting Mounting { get { return Mounting.NotSpecified; } }
 
         /// <summary>Nominal water flow in [m3/h]</summary>
 		public bool NewQnames { get { return waterMeterCfg.ProcParams.NewQnames; } }
@@ -42,10 +42,10 @@ namespace TBF.BenchControl.WaterMeters.Munich
 
 		/// <summary>Metrological class, etc</summary>
 		public string MetrologicalClass { get { return waterMeterCfg.ProcParams.MetrologicalClass; } }
-        public TemperatureClass TemperatureClass { get { return Config.Entities.TemperatureClass.NotSpecified; } }
-        public PressureLossClass PressureLossClass { get { return Config.Entities.PressureLossClass.NotSpecified; } }
-        public MaxAdmissiblePressure MaxAdmissiblePressure { get { return Config.Entities.MaxAdmissiblePressure.NotSpecified; } }
-        public FlowProfileSensitivityClass FlowProfileSensitivityClass { get { return Config.Entities.FlowProfileSensitivityClass.NotSpecified; } }
+        public TemperatureClass TemperatureClass { get { return TemperatureClass.NotSpecified; } }
+        public PressureLossClass PressureLossClass { get { return PressureLossClass.NotSpecified; } }
+        public MaxAdmissiblePressure MaxAdmissiblePressure { get { return MaxAdmissiblePressure.NotSpecified; } }
+        public FlowProfileSensitivityClass FlowProfileSensitivityClass { get { return FlowProfileSensitivityClass.NotSpecified; } }
 
 		/// <summary>WaterMeter approval information or signature</summary>
 		public string ApprovalInfo { get { return waterMeterCfg.ProcParams.ApprovalInfo; } }
@@ -60,7 +60,7 @@ namespace TBF.BenchControl.WaterMeters.Munich
         public string Text5 { get { return string.Empty; } }
 
 		/// <summary>Water: cold / hot</summary>
-        public Config.Entities.Medium WaterTemp { get { return Config.Entities.Medium.NotSpecified; } }
+        public Medium WaterTemp { get { return Medium.NotSpecified; } }
 
 		/// Properties set by the Begin and the End form
 		public string SerialNr { get; set; }
diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs
index 3f679a9d6..ab0aebd56 100644
--- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs
+++ b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs b/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
index 6542484bf..986c80fe7 100644
--- a/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
+++ b/TBF/BenchControl/WaterMeters/WaterMeter/ProcParams.cs
@@ -5,6 +5,7 @@ using System;
 using System.IO;
 using System.Text;
 using System.Xml.Serialization;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs
index 26c5f6064..f4ebdda23 100644
--- a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs
+++ b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeter.cs
@@ -2,7 +2,7 @@
 /// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using log4net;
-using Config.Entities;
+using Common;
 
 namespace TBF.BenchControl.WaterMeters.WaterMeter
 {
@@ -55,7 +55,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter
         public string Text5 { get { return waterMeterCfg.ProcParams.Text5; } }
 
 		/// <summary>Water: cold / hot</summary>
-		public Config.Entities.Medium Medium { get { return waterMeterCfg.ProcParams.WaterTemp; } }
+		public Medium Medium { get { return waterMeterCfg.ProcParams.WaterTemp; } }
 
 #if IPERL
         public ushort OriginalCalibFactor;
diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs
index 6aa728bad..6cf7cb411 100644
--- a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs
+++ b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfgCtrl.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/DB.cs b/TBF/DB.cs
index 756976ff1..290562d0d 100644
--- a/TBF/DB.cs
+++ b/TBF/DB.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using NHibernate;
+using Common;
 using Config;
 using Users.Entities;
 
diff --git a/TBF/LocalSettings.cs b/TBF/LocalSettings.cs
index 86cb78b11..49483931b 100644
--- a/TBF/LocalSettings.cs
+++ b/TBF/LocalSettings.cs
@@ -8,6 +8,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Xml.Serialization;
 using log4net;
+using Common;
 
 namespace TBF
 {
@@ -48,7 +49,7 @@ namespace TBF
 		/// <summary>
 		/// Login method: UserName, FullName or Number
 		/// </summary>
-		public Users.Entities.LoginMethod LoginMethod;
+		public Common.LoginMethod LoginMethod;
 
         /// <summary>
         /// Currently selected bench name (local or remote) or null (= no selection done).
@@ -88,7 +89,7 @@ namespace TBF
         public int PopupResultsWidth;
         public int PopupResultsHeight;
 
-        public Config.Entities.CameraDisplayResolution Resolution;
+        public CameraDisplayResolution Resolution;
 
         [XmlArrayAttribute("Counters")]
         public int[] Counters;
@@ -274,8 +275,8 @@ namespace TBF
         public int LastLegalizatorsCount { get { return (LastLegalizators != null) ? LastLegalizators.Length : 0; } }
 
 		/// Configuration of results
-		public Config.Entities.MetersArrangement ResultsConfigMeters;
-		public Config.Entities.TestsArrangement ResultsConfigTests;
+		public MetersArrangement ResultsConfigMeters;
+		public TestsArrangement ResultsConfigTests;
 		public int ResultsConfigMetersInOneGroup;
         public bool ShowDisabledPositions;
         public int ResultsConfigMinWidth;
diff --git a/TBF/Program.cs b/TBF/Program.cs
index 1e0331b9f..ee606dcfb 100644
--- a/TBF/Program.cs
+++ b/TBF/Program.cs
@@ -6,6 +6,7 @@ using System.IO;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Users;
 using Users.Entities;
@@ -256,12 +257,12 @@ namespace TBF
                             try
                             {
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-                                GID[] reqGrpMembership = new Users.Entities.GID[] { Users.Entities.GID.Testers, Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists, Users.Entities.GID.HeadOfLab };
+                                GID[] reqGrpMembership = new Common.GID[] { Common.GID.Testers, Common.GID.TestingSpecialists, Common.GID.Metrologists, Common.GID.HeadOfLab };
 #else
                                 GID[] reqGrpMembership = null;
 #endif
                                 bool authorized = false;
-								AuthorizedAs authorizedAs = Users.Entities.AuthorizedAs.PowerUser;
+								AuthorizedAs authorizedAs = Common.AuthorizedAs.PowerUser;
 
 								if (Users.Entities.User.IsPowerUser(loginDlgBench.Alias, loginDlgBench.Password))
 								{
@@ -269,7 +270,7 @@ namespace TBF
                                     authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
                                     if (authorized)
                                     {
-                                        GlobalData.AuthorizedAs = Users.Entities.AuthorizedAs.PowerUser;
+                                        GlobalData.AuthorizedAs = Common.AuthorizedAs.PowerUser;
                                     }
 								}
 
@@ -280,7 +281,7 @@ namespace TBF
 								{
 									DBSettings[] dbs = new DBSettings[] { GlobalData.RemoteUsersDB, GlobalData.LocalUsersDB };
 
-									authorizedAs = Users.Entities.AuthorizedAs.RemoteUser;		/// Try remote DB first
+									authorizedAs = Common.AuthorizedAs.RemoteUser;		/// Try remote DB first
 
 									foreach (var db in dbs)
 									{
@@ -297,15 +298,15 @@ namespace TBF
                                                 switch (loginDlgBench.Method)
                                                 {
                                                     default:
-                                                    case Users.Entities.LoginMethod.UserName:
+                                                    case Common.LoginMethod.UserName:
                                                         loadedUser = Users.Entities.User.LoadUserByName(loginDlgBench.Alias, db);
                                                         if (loadedUser != null) authorized = loadedUser.Authorize(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
                                                         break;
-                                                    case Users.Entities.LoginMethod.FullName:
+                                                    case Common.LoginMethod.FullName:
                                                         loadedUser = Users.Entities.User.LoadUserByFullName(loginDlgBench.Alias, db);
                                                         if (loadedUser != null) authorized = loadedUser.AuthorizeFullName(loginDlgBench.Alias, loginDlgBench.Password, reqGrpMembership);
                                                         break;
-                                                    case Users.Entities.LoginMethod.Number:
+                                                    case Common.LoginMethod.Number:
                                                         int number;
                                                         if (!int.TryParse(loginDlgBench.Alias, out number)) break;
                                                         loadedUser = Users.Entities.User.LoadUserByNumber(number, db);
@@ -321,7 +322,7 @@ namespace TBF
 
 										if (authorized) break;
 
-										authorizedAs = Users.Entities.AuthorizedAs.LocalUser;	/// Try local DB afterwards
+										authorizedAs = Common.AuthorizedAs.LocalUser;	/// Try local DB afterwards
 									}
 								}
 
@@ -360,9 +361,9 @@ namespace TBF
                                     /// Connect to Config database.
                                     /// This triggers an exception in case user is a power user and there is no Config database.
                                     /// 
-                                    IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Users.Entities.DBKind.Config)
+                                    IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Common.DBKind.Config)
                                                                                            .QueryOver<Procedure>()
-                                                                                           .Where(x => (x.ProcedureState == ProcedureState.Active))
+                                                                                           .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
                                                                                            .And(x => (x.Name == LocalSettings.LastProcedureName))
                                                                                            .List();
 
@@ -382,10 +383,10 @@ namespace TBF
                                     ///
                                     /// Connect to Events database (if any) and load recent events from this test bench.
                                     ///
-                                    if (TBF.DB.CurrentBench.EventsDBSettings.DbType != Users.Entities.DBType.None &&
+                                    if (TBF.DB.CurrentBench.EventsDBSettings.DbType != Common.DBType.None &&
                                         !string.IsNullOrEmpty(TBF.DB.CurrentBench.EventsDBSettings.ConnectionString))
                                     {
-                                        Events.DB.DbType = (Events.Entities.DBType)TBF.DB.CurrentBench.EventsDBSettings.DbType;
+                                        Events.DB.DbType = (DBType)TBF.DB.CurrentBench.EventsDBSettings.DbType;
                                         Events.DB.ConnectionString = TBF.DB.CurrentBench.EventsDBSettings.ConnectionString;
                                         Events.DB.LoadRecentEvents(Events.DB.CreateSession(), loginDlgBench.BenchName, 7);  /// Last 7 days
                                     }
@@ -446,9 +447,9 @@ namespace TBF
             /// 
             if (LocalSettings.LastProcedureName != null)
             {
-                IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Users.Entities.DBKind.Config)
+                IList<Procedure> listOfProcedures = TBF.DB.CreateSession(Common.DBKind.Config)
 					                                                   .QueryOver<Procedure>()
-                                                                       .Where(x => (x.ProcedureState == ProcedureState.Active))
+                                                                       .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
                                                                        .And(x => (x.Name == LocalSettings.LastProcedureName))
 					                                                   .List();
 
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 3a3ff60f6..a9b80174a 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -123,6 +123,9 @@
     <Reference Include="MySql.Data">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate">
       <HintPath>..\packages\NHibernate.4.0.4.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
@@ -2109,7 +2112,7 @@
     <Compile Include="BenchControl\GenericDevices\IDiverter.cs" />
     <Compile Include="BenchControl\GenericDevices\IFlowMeter.cs" />
     <Compile Include="BenchControl\GenericDevices\IPressureMeter.cs" />
-    <Compile Include="BenchControl\GenericDevices\IRegulValve.cs" />
+    <Compile Include="BenchControl\GenericDevices\IRegValve.cs" />
     <Compile Include="BenchControl\GenericDevices\ITempMeter.cs" />
     <Compile Include="BenchControl\GenericDevices\IValve.cs" />
     <Compile Include="BenchControl\Generic\IComponent.cs" />
diff --git a/TBF/UI/Bench/Components/ComponentParametersDlg.cs b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
index e47175daf..aed8056a8 100644
--- a/TBF/UI/Bench/Components/ComponentParametersDlg.cs
+++ b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.Generic;
 using TBF.Resources;
diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
index d5cef029c..747754e7b 100644
--- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
+++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using Results.Forms;
 using TBF.BenchControl;
@@ -68,7 +69,7 @@ namespace TBF.UI.Bench.Components
 			selectComponentTypeDlg = new SelectComponentClassDlg();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 
             sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
                                             SharedButtons.Buttons.Remove |
@@ -119,7 +120,7 @@ namespace TBF.UI.Bench.Components
 
 			sharedButtons.DisableButtons(SharedButtons.Buttons.Remove | SharedButtons.Buttons.Edit);
 
-			session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+			session = TBF.DB.CreateSession(Common.DBKind.Config);
 			cmpntEntities = session.QueryOver<Component>()
                                    .OrderBy(x => x.ItemNr).Asc
                 				   .List<Component>();
diff --git a/TBF/UI/Bench/Metrology/MetrologyDlg.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
index 371f8e2fc..ec8609975 100644
--- a/TBF/UI/Bench/Metrology/MetrologyDlg.cs
+++ b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
@@ -26,7 +26,7 @@ namespace TBF.UI.Bench.Metrology
 			InitializeComponent();
 
             /// SharedDlgButtons configuration
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists, Users.Entities.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists, Common.GID.MetrologicalAuthority };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
             sharedButtons.Unlocked += unlockButton_Click;
             sharedButtons.OKClicked += okButton_Click;
@@ -51,7 +51,7 @@ namespace TBF.UI.Bench.Metrology
             int platinumTempMetersCount = 0;
             int evaporationsCount = 0;
 
-			session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+			session = TBF.DB.CreateSession(Common.DBKind.Config);
 			cmpntEntities = session.QueryOver<Component>()
                                    .OrderBy(x => x. ItemNr).Asc
 								   .List();
diff --git a/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
index 08eb41e96..d7aab7687 100644
--- a/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
+++ b/TBF/UI/Bench/Metrology/MetrologyDlgDensityTab.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.Resources;
 
diff --git a/TBF/UI/Bench/Paths/PathsDlg.cs b/TBF/UI/Bench/Paths/PathsDlg.cs
index 8d7ceca95..957e1d602 100644
--- a/TBF/UI/Bench/Paths/PathsDlg.cs
+++ b/TBF/UI/Bench/Paths/PathsDlg.cs
@@ -34,8 +34,8 @@ namespace TBF.UI.Bench.Paths
 
 		public IList<BenchControl.Generic.IComponent> TbfComponents;
 		public IList<IValve> Valves;
-        public IList<IRegulValve> FeedingRegulValves;
-        public IList<IRegulValve> OutputRegulValves;
+        public IList<IRegValve> FeedingRegulValves;
+        public IList<IRegValve> OutputRegulValves;
         public ISession Session;			/// One common DB session passed also to the controls inside tab pages
         public IList<Procedure> Procedures;
         public IList<Test> Tests;
@@ -53,7 +53,7 @@ namespace TBF.UI.Bench.Paths
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up | SharedButtons.Buttons.Down;
 			sharedButtons.Unlocked += Unlocked;
@@ -67,7 +67,7 @@ namespace TBF.UI.Bench.Paths
 			/// Load the list of components from the database
             try
             {
-                TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Users.Entities.DBKind.Config));
+                TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(TBF.DB.CreateSession(Common.DBKind.Config));
             }
             catch
             {
@@ -79,11 +79,11 @@ namespace TBF.UI.Bench.Paths
 			Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
 
             /// Find all feeding regulation valves
-            FeedingRegulValves = new List<IRegulValve>();
-            OutputRegulValves = new List<IRegulValve>(); 
+            FeedingRegulValves = new List<IRegValve>();
+            OutputRegulValves = new List<IRegValve>(); 
             foreach (var cmpnt in TbfComponents)
             {
-                IRegulValve regValve = cmpnt as IRegulValve;
+                IRegValve regValve = cmpnt as IRegValve;
                 if (regValve != null && !(cmpnt is TBF.BenchControl.Elde.RegulValveTandem.RegulValveTandem))
                 {
                     switch (regValve.Category)
@@ -99,7 +99,7 @@ namespace TBF.UI.Bench.Paths
             }
 
 			/// Create the database session for paths
-			Session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+			Session = TBF.DB.CreateSession(Common.DBKind.Config);
 
             Procedures = Session.QueryOver<Procedure>().List();
             Tests = Session.QueryOver<Test>().List();
diff --git a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs
index 9cb02fce4..cb7639a19 100644
--- a/TBF/UI/Bench/Paths/PathsOutputCtrl.cs
+++ b/TBF/UI/Bench/Paths/PathsOutputCtrl.cs
@@ -148,7 +148,7 @@ namespace TBF.UI.Bench.Paths
             foreach (var cmpnt in parent.TbfComponents)
 			{
                 if (cmpnt is IFlowMeter) flowMeterComboBox.Items.Add(cmpnt.Cfg.Name);
-                if (cmpnt is IRegulValve) regulValveComboBox.Items.Add(cmpnt.Cfg.Name);
+                if (cmpnt is IRegValve) regulValveComboBox.Items.Add(cmpnt.Cfg.Name);
 				if (cmpnt is IDiverter) diverterComboBox.Items.Add(cmpnt.Cfg.Name);
                 if (cmpnt is ITempMeter) tempMeterDivComboBox.Items.Add(cmpnt.Cfg.Name);
                 if (cmpnt is IScaleOrTank) scaleComboBox.Items.Add(cmpnt.Cfg.Name);
diff --git a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
index 3a27359d9..a59158798 100644
--- a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
+++ b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Forms;
 using TBF.BenchControl.Generic;
@@ -50,7 +51,7 @@ namespace TBF.UI.Bench.TestProfiles
 			InitializeComponent();
 
             /// SharedDlgButtons configuration
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
 
             sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up | SharedButtons.Buttons.Down;
@@ -87,7 +88,7 @@ namespace TBF.UI.Bench.TestProfiles
 			this.usedNames = usedNames;
             this.openUnlocked = openUnlocked;
 
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
 		}
 
 		private void TestProfileDlg_Load(object sender, EventArgs e)
@@ -243,7 +244,7 @@ namespace TBF.UI.Bench.TestProfiles
             lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 80 });
 
             ComboBox publishCBox = new ComboBox();   /// control for Publish
-            for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
+            for (Publish pb = 0; pb < Publish.Count; pb++)
             {
                 publishCBox.Items.Add(pb.ToDescription());
             }
@@ -309,7 +310,7 @@ namespace TBF.UI.Bench.TestProfiles
             lvi.SubItems.Add(pTest.TempLimHi.ToString());
             lvi.SubItems.Add(pTest.PressLimLo.ToString());
             lvi.SubItems.Add(pTest.PressLimHi.ToString());
-            lvi.SubItems.Add(((Config.Entities.Publish)pTest.Publish).ToDescription());
+            lvi.SubItems.Add(((Publish)pTest.Publish).ToDescription());
             lvi.SubItems.Add(pTest.Evaluate ? Strings.yes : Strings.no);
 
             metrologyListViewEx.Items.Add(lvi);
@@ -356,7 +357,7 @@ namespace TBF.UI.Bench.TestProfiles
 
                     entity.Evaluate = lvi.SubItems[(int)MtrlgyClmn.Evaluate].Text.Equals(Strings.yes);
 
-                    for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
+                    for (Publish pb = 0; pb < Publish.Count; pb++)
                     {
                         if (lvi.SubItems[(int)MtrlgyClmn.Publish].Text.Equals(pb.ToDescription()))
                         {
diff --git a/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs b/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs
index 9e239cb41..09a4ce147 100644
--- a/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs
+++ b/TBF/UI/Bench/TestProfiles/TestProfilesCtrl.cs
@@ -51,7 +51,7 @@ namespace TBF.UI.Bench.TestProfiles
 		{
             if (Parent == null) return;
 
-            session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+            session = TBF.DB.CreateSession(Common.DBKind.Config);
 
 			this.parent = parent;
 			this.parentControl = parentControl;
diff --git a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
index 92c0c512f..9419f016e 100644
--- a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
+++ b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
@@ -25,7 +25,7 @@ namespace TBF.UI.Bench.TestProfiles
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
 
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |
diff --git a/TBF/UI/Bench/Transitions/TransitionsDlg.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.cs
index 1ec82081e..b26677fb3 100644
--- a/TBF/UI/Bench/Transitions/TransitionsDlg.cs
+++ b/TBF/UI/Bench/Transitions/TransitionsDlg.cs
@@ -53,7 +53,7 @@ namespace TBF.UI.Bench.Transitions
 		/// Auxiliary public lists used also by user controls in tab pages
 		public IList<BenchControl.Generic.IComponent> TbfComponents;
 		public IList<IValve> Valves;
-		public IList<IRegulValve> RegulValves;
+		public IList<IRegValve> RegulValves;
 
 
         IList<ITabWithListViewEx> seqStepsCtrls;
@@ -67,7 +67,7 @@ namespace TBF.UI.Bench.Transitions
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
 											SharedButtons.Buttons.Up | SharedButtons.Buttons.Down |
                                             SharedButtons.Buttons.Export | SharedButtons.Buttons.Import |
@@ -90,17 +90,17 @@ namespace TBF.UI.Bench.Transitions
             seqStepsCtrls = new List<ITabWithListViewEx>();
 
             /// Open the database
-            Session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+            Session = TBF.DB.CreateSession(Common.DBKind.Config);
 
             /// Prepare a list of components and a list of all valves in the test bench
             TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(Session);
             Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
-            RegulValves = new List<IRegulValve>();
+            RegulValves = new List<IRegValve>();
             foreach (var cmpnt in TbfComponents)
             {
-                if ((cmpnt is IRegulValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
+                if ((cmpnt is IRegValve) && !(cmpnt is BenchControl.Elde.RegulValveTandem.RegulValveTandem))
                 {
-                    RegulValves.Add(cmpnt as IRegulValve);
+                    RegulValves.Add(cmpnt as IRegValve);
                 }
             }
 
@@ -307,8 +307,8 @@ namespace TBF.UI.Bench.Transitions
 					int occurances = 0;
 					foreach (var test in tests)
 					{
-						if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++;
-						if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++;
 					}
 					foreach (var proc in procedures)
 					{
@@ -329,8 +329,8 @@ namespace TBF.UI.Bench.Transitions
 					int occurances = 0;
 					foreach (var test in tests)
 					{
-						if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++;
-						if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++;
 					}
 					foreach (var proc in procedures)
 					{
@@ -352,8 +352,8 @@ namespace TBF.UI.Bench.Transitions
 					int occurances = 0;
 					foreach (var test in tests)
 					{
-						if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++;
-						if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++;
 					}
 					foreach (var proc in procedures)
 					{
@@ -374,8 +374,8 @@ namespace TBF.UI.Bench.Transitions
 					int occurances = 0;
 					foreach (var test in tests)
 					{
-						if (!string.IsNullOrEmpty(test.RelTransBefore) && test.RelTransBefore == seq.OriName) occurances++;
-						if (!string.IsNullOrEmpty(test.TransitionAfter) && test.TransitionAfter == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransBefore) && test.TransBefore == seq.OriName) occurances++;
+						if (!string.IsNullOrEmpty(test.TransAfter) && test.TransAfter == seq.OriName) occurances++;
 					}
 					foreach (var proc in procedures)
 					{
@@ -427,20 +427,20 @@ namespace TBF.UI.Bench.Transitions
 						foreach (var ri in renameInfo)
 						{
 							var tests = Session.QueryOver<Config.Entities.Test>()
-											   .Where(x => (x.RelTransBefore == ri.Key))
+											   .Where(x => (x.TransBefore == ri.Key))
 											   .List();
 							foreach (var t in tests)
 							{
-								t.RelTransBefore = ri.Value;
+								t.TransBefore = ri.Value;
 								Session.Update(t);
 							}
 
 							tests = Session.QueryOver<Config.Entities.Test>()
-										   .Where(x => (x.TransitionAfter == ri.Key))
+										   .Where(x => (x.TransAfter == ri.Key))
 										   .List();
 							foreach (var t in tests)
 							{
-								t.TransitionAfter = ri.Value;
+								t.TransAfter = ri.Value;
 								Session.Update(t);
 							}
 
diff --git a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
index e79a76474..bfc001952 100644
--- a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+++ b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
@@ -27,9 +27,9 @@ namespace TBF.UI.Bench.Uncertainties
 
             /// SharedDlgButtons configuration
 #if KEMPNO_50
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.MetrologicalAuthority };
+            sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.MetrologicalAuthority };
 #else
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.Metrologists };
+			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 #endif
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove;
             sharedButtons.Unlocked += unlockButton_Click;
@@ -54,7 +54,7 @@ namespace TBF.UI.Bench.Uncertainties
             int tempMetersCount = 0;
             int evaporationsCount = 0;
 
-			session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+			session = TBF.DB.CreateSession(Common.DBKind.Config);
 			cmpntEntities = session.QueryOver<Component>()
                                    .OrderBy(x => x. ItemNr).Asc
 								   .List();
diff --git a/TBF/UI/Calendar/CalendarTabPageCtrl.cs b/TBF/UI/Calendar/CalendarTabPageCtrl.cs
index dc8a3b14e..984b08678 100644
--- a/TBF/UI/Calendar/CalendarTabPageCtrl.cs
+++ b/TBF/UI/Calendar/CalendarTabPageCtrl.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using Config.CalendarEvent;
 using Events.Entities;
@@ -67,7 +68,7 @@ namespace TBF.UI.Calendar
             try
             {
                 /// Read custom events from the database
-                ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                 customEvents = session.QueryOver<CustomEvent>().List();
 
                 TripplicateShiftCustomEvents(customEvents);
@@ -159,7 +160,7 @@ namespace TBF.UI.Calendar
 
             try
             {
-                var session = (parentSession != null) ? parentSession : TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                var session = (parentSession != null) ? parentSession : TBF.DB.CreateSession(Common.DBKind.Config);
                 var customEvents = (customEventsFromDB != null) ? customEventsFromDB : session.QueryOver<CustomEvent>() .List();
 
                 for (int i = customEvents.Count - 1; i >= 0; i--)
@@ -235,7 +236,7 @@ namespace TBF.UI.Calendar
 
             try
             {
-                ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                 var customEventsFromDB = session.QueryOver<CustomEvent>().List();
 
                 for (int i = customEventsFromDB.Count - 1; i >= 0; i--)
@@ -278,15 +279,15 @@ namespace TBF.UI.Calendar
         /// </summary>
         /// <param name="action">AutoAction enum value</param>
         /// <returns>Severity enum value</returns>
-        Events.Entities.Severity ToSeverity(AutoAction action)
+        Severity ToSeverity(AutoAction action)
         {
             switch (action)
             {
                 default:
-                case AutoAction.Notification:   return global::Events.Entities.Severity.Notification;
-                case AutoAction.Warning:        return global::Events.Entities.Severity.Warning;
-                case AutoAction.Error:          return global::Events.Entities.Severity.Error;
-                case AutoAction.FatalErr:     return global::Events.Entities.Severity.FatalError;
+                case AutoAction.Notification:   return Severity.Notification;
+                case AutoAction.Warning:        return Severity.Warning;
+                case AutoAction.Error:          return Severity.Error;
+                case AutoAction.FatalErr:       return Severity.FatalError;
             }
         }
 
@@ -321,7 +322,7 @@ namespace TBF.UI.Calendar
             {
                 try
                 {
-                    ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                    ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                     session.SaveOrUpdate(dlg.NewEvent as CustomEvent);
                     session.Flush();
 
@@ -357,7 +358,7 @@ namespace TBF.UI.Calendar
             try
             {
                 /// Re-read selected custom event from the database
-                ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
                 var cEvents = session.QueryOver<CustomEvent>()
                                      .Where(x => (x.Id == evnt.Id))
                                      .List();
diff --git a/TBF/UI/Camera/PicturesTabPageCtrl.cs b/TBF/UI/Camera/PicturesTabPageCtrl.cs
index 089e944c8..a2cb9a021 100644
--- a/TBF/UI/Camera/PicturesTabPageCtrl.cs
+++ b/TBF/UI/Camera/PicturesTabPageCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.UiBridge;
 
diff --git a/TBF/UI/MainWnd.cs b/TBF/UI/MainWnd.cs
index 9f5727b76..40cedee89 100644
--- a/TBF/UI/MainWnd.cs
+++ b/TBF/UI/MainWnd.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Threading;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.Resources;
 using TBF.UiBridge;
@@ -457,22 +458,22 @@ namespace TBF.UI
         public void UpdateUser()
         {
 			userInfoStatusLabel.Text = string.Format("{0}: {1}{2}, ", Strings.User, Users.GlobalData.CurrentUser.UserName,
-				(Users.GlobalData.AuthorizedAs == Users.Entities.AuthorizedAs.PowerUser) ? "(S)" :
-				((Users.GlobalData.AuthorizedAs == Users.Entities.AuthorizedAs.LocalUser) ? "(L)" : "(R)"));
+				(Users.GlobalData.AuthorizedAs == Common.AuthorizedAs.PowerUser) ? "(S)" :
+				((Users.GlobalData.AuthorizedAs == Common.AuthorizedAs.LocalUser) ? "(L)" : "(R)"));
 
             UpdateMenuItemsVisibility();
         }
 
         void UpdateMenuItemsVisibility()
         {
-            usersTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) ||
-                                      Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.HeadOfLab);
-            databaseSettingsTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser(); ;
-            upgradeTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser();
-            clearCountersToolStripMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Administrators) ||
-                                                     Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.HeadOfLab) ||
-                                                     Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.TestingSpecialists) ||
-                                                     Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Metrologists);
+            usersTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.Administrators) ||
+                                      Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.HeadOfLab);
+            databaseSettingsTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser(); ;
+            upgradeTSMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.Administrators) && Users.GlobalData.CurrentUser.IsPowerUser();
+            clearCountersToolStripMenuItem.Visible = Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.Administrators) ||
+                                                     Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.HeadOfLab) ||
+                                                     Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.TestingSpecialists) ||
+                                                     Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.Metrologists);
         }
 
         public void UpdateStatusP(string statusPStr)
@@ -561,26 +562,26 @@ namespace TBF.UI
             BenchControl.GenericDevices.IBenchInfo benchInfo = BenchControl.Sequences.ProcessData.BenchInfo;
             RemoteDBUse remoteDbUse = (benchInfo != null) ? benchInfo.RemoteDBUse : RemoteDBUse.LocalDBOnly;
 
-            Users.Entities.DBKind[] dBase;
+            Common.DBKind[] dBase;
             string[] signature;
             ///
             switch (remoteDbUse)
             {
                 default:
                 case RemoteDBUse.LocalDBOnly:
-                    dBase = new Users.Entities.DBKind[] { Users.Entities.DBKind.Config };
+                    dBase = new Common.DBKind[] { Common.DBKind.Config };
                     signature = new string[] { "" };
                     break;
                 case RemoteDBUse.RemoteDBOnly:
-                    dBase = new Users.Entities.DBKind[] { Users.Entities.DBKind.RemoteConfig };
+                    dBase = new Common.DBKind[] { Common.DBKind.RemoteConfig };
                     signature = new string[] { "R" };
                     break;
                 case RemoteDBUse.BothDBsLocalFirst:
-                    dBase = new Users.Entities.DBKind[] { Users.Entities.DBKind.Config, Users.Entities.DBKind.RemoteConfig };
+                    dBase = new Common.DBKind[] { Common.DBKind.Config, Common.DBKind.RemoteConfig };
                     signature = new string[] { "L", "R" };
                     break;
                 case RemoteDBUse.BothDBsRemoteFirst:
-                    dBase = new Users.Entities.DBKind[] { Users.Entities.DBKind.RemoteConfig, Users.Entities.DBKind.Config };
+                    dBase = new Common.DBKind[] { Common.DBKind.RemoteConfig, Common.DBKind.Config };
                     signature = new string[] { "R", "L" };
                     break;
             }
@@ -605,7 +606,7 @@ namespace TBF.UI
                         if ((procedureNameToSelect == proc.Name) && !procedureSet)
                         {
                             procedureComboBox.Text = itemText;
-                            SelectedProcedure = new ProcedureInfo(procedureNameToSelect, (dBase[i] == Users.Entities.DBKind.RemoteConfig));
+                            SelectedProcedure = new ProcedureInfo(procedureNameToSelect, (dBase[i] == Common.DBKind.RemoteConfig));
                             procedureSet = true;
                         }
                     }
@@ -832,9 +833,9 @@ namespace TBF.UI
         private void statusStrip1_DoubleClick(object sender, EventArgs e)
         {
 #if TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL
-            Users.Entities.GID[] reqGrpMembership = new Users.Entities.GID[] { Users.Entities.GID.Testers, Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists, Users.Entities.GID.HeadOfLab };
+            Common.GID[] reqGrpMembership = new Common.GID[] { Common.GID.Testers, Common.GID.TestingSpecialists, Common.GID.Metrologists, Common.GID.HeadOfLab };
 #else
-            Users.Entities.GID[] reqGrpMembership = null;
+            Common.GID[] reqGrpMembership = null;
 #endif
 
             if (new Users.Forms.LoginDlg(reqGrpMembership).ShowDialog() == DialogResult.OK)
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 8c880f9f1..db8132af3 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Forms;
 using TBF.BenchControl.Generic;
@@ -46,7 +47,7 @@ namespace TBF.UI.Procedures
 		/// Auxiliary public lists used also by user controls in tab pages
 		public IList<BenchControl.Generic.IComponent> TbfComponents;
 		public IList<IValve> Valves;
-		public IList<IRegulValve> RegulValves;
+		public IList<IRegValve> RegulValves;
 		public IList<ITestMethod> TestMethods;
 		public IList<ITestMethod> UsedTestMethods;
 		ComboBox methodCBox;
@@ -74,9 +75,9 @@ namespace TBF.UI.Procedures
 
             /// SharedDlgButtons configuration
 #if KEMPNO_50 || KRAKOW_50
-			sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.WaterMeterAuthority };
+			sharedButtons.RequiredGroupMembership = new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority };
 #else
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
+            sharedButtons.RequiredGroupMembership = new GID[] { GID.TestingSpecialists, GID.Metrologists };
 #endif
 
             sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
@@ -129,22 +130,22 @@ namespace TBF.UI.Procedures
             this.initialMode = initialMode;
 
 #if KEMPNO_50 || KRAKOW_50
-            sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Entities.GID[] { Users.Entities.GID.WaterMeterAuthority }
-                                                                        : new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.WaterMeterAuthority };
+            sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.WaterMeterAuthority }
+                                                                        : new GID[] { GID.TestingSpecialists, GID.WaterMeterAuthority };
 #else
-            sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Entities.GID[] { Users.Entities.GID.Metrologists }
-                                                                        : new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
+            sharedButtons.RequiredGroupMembership = procedure.Protected ? new GID[] { GID.Metrologists }
+                                                                        : new GID[] { GID.TestingSpecialists, GID.Metrologists };
 #endif
             if (initialMode == Mode.PermanentlyLocked) sharedButtons.DisableUnlock();
 
-			using (NHibernate.ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config))
+			using (NHibernate.ISession session = TBF.DB.CreateSession(DBKind.Config))
 			{
                 ///
                 /// Prepare a list of components and a list of all valves in the test bench
                 ///
                 TbfComponents = BenchControl.TbfComponents.LoadComponentsFromDB(session);
 				Valves = BenchControl.GenericDevices.ValveBase.MasterValves(TbfComponents);
-				RegulValves = new List<IRegulValve>();
+				RegulValves = new List<IRegValve>();
 				TestMethods = new List<ITestMethod>();
 				dataEntryComboBox.Items.Add("---");
 				printer1ComboBox.Items.Add("---");
@@ -160,7 +161,7 @@ namespace TBF.UI.Procedures
 
                 foreach (var cmpnt in TbfComponents)
 				{
-					if (cmpnt is IRegulValve) RegulValves.Add(cmpnt as IRegulValve);
+					if (cmpnt is IRegValve) RegulValves.Add(cmpnt as IRegValve);
 					if (cmpnt is ITestMethod) TestMethods.Add(cmpnt as ITestMethod);
 					if (cmpnt is IDataEntry) dataEntryComboBox.Items.Add(cmpnt.Cfg.Name);
                     if (cmpnt is IResultsPrinter)
@@ -696,7 +697,7 @@ namespace TBF.UI.Procedures
 
 		void RefreshHistoryTab()
 		{
-			NHibernate.ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+			NHibernate.ISession session = TBF.DB.CreateSession(DBKind.Config);
 			IList<Procedure> procedures = session
                 .QueryOver<Procedure>()
                 .Where(x => x.ProcedureState == ProcedureState.History)
@@ -848,7 +849,7 @@ namespace TBF.UI.Procedures
             lvi.SubItems.Add(test.Qfrom.ToString());							/// Q_from
             lvi.SubItems.Add(test.Qto.ToString());								/// Q_to
             lvi.SubItems.Add(test.Volume.ToString());							/// VOlume
-            lvi.SubItems.Add(test.TstTime.ToString());
+            lvi.SubItems.Add(test.TestTime.ToString());
             lvi.SubItems.Add(test.ErrLimLo.ToString());
             lvi.SubItems.Add(test.ErrLimHi.ToString());
             lvi.SubItems.Add(test.TempLimLo.ToString());
@@ -885,7 +886,7 @@ namespace TBF.UI.Procedures
                 if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qfrom].Text, out tmp)) entity.Qfrom = tmp;
 				if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Qto].Text,     out tmp)) entity.Qto = tmp;
 				if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.Volume].Text,  out tmp)) entity.Volume = tmp;
-				if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TstTime = tmp;
+				if (Utils.TryParseUFloat(lvi.SubItems[(int)MtrlgyClmn.TestTime].Text,out tmp)) entity.TestTime = tmp;
 
 				if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimLo].Text, out tmp)) entity.ErrLimLo = tmp;
 				if (Utils.TryParseSFloat(lvi.SubItems[(int)MtrlgyClmn.ErrLimHi].Text, out tmp)) entity.ErrLimHi = tmp;
@@ -1072,7 +1073,7 @@ namespace TBF.UI.Procedures
 			lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
 
 			ComboBox publishCBox = new ComboBox();   /// control for Publish
-			for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
+			for (Publish pb = 0; pb < Publish.Count; pb++)
 			{
                 publishCBox.Items.Add(pb.ToDescription());
 			}
@@ -1125,8 +1126,8 @@ namespace TBF.UI.Procedures
             lvi.SubItems.Add(test.Uncertainty.ToString());
             lvi.SubItems.Add(test.Repeats.ToString());
             lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
-            lvi.SubItems.Add(test.TolerRed.ToString());
-            lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription());
+            lvi.SubItems.Add(test.ShortPulses.ToString());
+            lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
             lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no);
 
             metrology2ListViewEx.Items.Add(lvi);
@@ -1146,10 +1147,10 @@ namespace TBF.UI.Procedures
                     entity.Uncertainty = Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.Uncertainty].Text);
                     entity.Repeats = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.Repeats].Text);
                     entity.DoControlWaterTemp = lvi.SubItems[(int)Mtrlgy2Clmn.ControlWaterTemp].Text.Equals(Strings.yes);
-                    entity.TolerRed = (double)Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
+                    entity.ShortPulses = (double)Utils.ParseUFloat(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
                     entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes);
 
-                    for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
+                    for (Publish pb = 0; pb < Publish.Count; pb++)
                     {
                         if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription()))
                         {
@@ -1402,9 +1403,9 @@ namespace TBF.UI.Procedures
                 lvi.SubItems.Add(test.HeatMetersPath);
 #endif
                 lvi.SubItems.Add(test.MetersPath);
-                lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBefore) ? "---" : test.RelTransBefore);
-                lvi.SubItems.Add(string.IsNullOrEmpty(test.RelTransBetween) ? "---" : test.RelTransBetween);
-                lvi.SubItems.Add(string.IsNullOrEmpty(test.TransitionAfter) ? "---" : test.TransitionAfter);
+                lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBefore) ? "---" : test.TransBefore);
+                lvi.SubItems.Add(string.IsNullOrEmpty(test.TransBetween) ? "---" : test.TransBetween);
+                lvi.SubItems.Add(string.IsNullOrEmpty(test.TransAfter) ? "---" : test.TransAfter);
             }
 
             processListViewEx.Items.Add(lvi);
@@ -1466,21 +1467,21 @@ namespace TBF.UI.Procedures
                     subItemText = lvi.SubItems[column].Text;
                     if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
                     {
-                        test.RelTransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
+                        test.TransBefore = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
                     }
 
                     column = (int)ProcessClmn.TrnBetween;
                     subItemText = lvi.SubItems[column].Text;
                     if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
                     {
-                        test.RelTransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
+                        test.TransBetween = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
                     }
 
                     column = (int)ProcessClmn.TrnStop;
                     subItemText = lvi.SubItems[column].Text;
                     if (string.IsNullOrEmpty(subItemText) || (processEditors[column] as ComboBox).Items.Contains(subItemText))
                     {
-                        test.TransitionAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
+                        test.TransAfter = (string.IsNullOrEmpty(subItemText) || subItemText.Equals("---")) ? string.Empty : subItemText;
                     }
                 }
 
@@ -1930,7 +1931,7 @@ namespace TBF.UI.Procedures
 			procNameTextBox.Enabled = true;
 			descriptionTextBox.Enabled = true;
 			watermetersTextBox.Enabled = true;
-			protectedCheckBox.Enabled = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Metrologists);
+			protectedCheckBox.Enabled = Users.GlobalData.CurrentUser.IsMemberOf(GID.Metrologists);
             mustBeCompleteCheckBox.Enabled = true;
 			manualControlDisabledCheckBox.Enabled = true;
 			dataEntryComboBox.Enabled = true;
@@ -2718,15 +2719,15 @@ namespace TBF.UI.Procedures
                     break;
             }
 
-            using (NHibernate.ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config))
+            using (NHibernate.ISession session = TBF.DB.CreateSession(DBKind.Config))
 			{
                 IList<Test> testsToBeUpdated = new List<Test>();
 
                 foreach (var test in LoadedProcedure.Tests)
                 {
-                    foreach (var tetsMethod in TestMethods)
+                    foreach (var testMethod in TestMethods)
                     {
-                        if (tetsMethod.Name == test.Method && tetsMethod.ClassName == "TestMethods.Dummy")
+                        if (testMethod.Name == test.Method && testMethod.ClassName == "TestMethods.Dummy")
                         {
                             testsToBeUpdated.Add(test);
                             break;
@@ -2807,7 +2808,7 @@ namespace TBF.UI.Procedures
 
                                 test.Qfrom = (float)qfrom;
                                 test.Qto = (float)qto;
-                                test.TstTime = (float)ti.TestTime;
+                                test.TestTime = (float)ti.TestTime;
                                 test.Volume = (float)volume;
                                 test.ErrLimLo = (float)(ti.ErrLimLoFromDB - ti.Uncertainty);
                                 test.ErrLimHi = (float)(ti.ErrLimHiFromDB + ti.Uncertainty);
diff --git a/TBF/UI/Procedures/ProcedureParamsCtrl.cs b/TBF/UI/Procedures/ProcedureParamsCtrl.cs
index 7318475e9..9309e9411 100644
--- a/TBF/UI/Procedures/ProcedureParamsCtrl.cs
+++ b/TBF/UI/Procedures/ProcedureParamsCtrl.cs
@@ -26,7 +26,7 @@ namespace TBF.UI.Procedures
 		int nrFixedColumns;
 		IList<IComponent> selectedCmpnts;
 
-        List<IParamsProvider> cmpntsParams;
+        IList<IParamsProvider> cmpntsParams;
         public IList<IParamsProvider> CmpntsParams { get { return cmpntsParams; } }
 
 		int paramsCount;
@@ -83,7 +83,7 @@ namespace TBF.UI.Procedures
                     }
                 }
 
-                CmpntsParams.Add(procedureParams);
+                cmpntsParams.Add(procedureParams);
 			}
 
 			if (sampleToCreateHeader != null)
@@ -178,7 +178,7 @@ namespace TBF.UI.Procedures
 		public void RedrawAll()
 		{
 			listViewEx.Items.Clear();
-			foreach (var item in CmpntsParams) DrawOne(item);
+			foreach (var item in cmpntsParams) DrawOne(item);
 		}
 
 		void DrawOne(IParamsProvider item)
diff --git a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs
index c7ca11fa7..20e2e3c23 100644
--- a/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs
+++ b/TBF/UI/Procedures/ProcedureParamsMixedCtrl.cs
@@ -136,7 +136,6 @@ namespace TBF.UI.Procedures
             }
         }
 
-
 		public void RedrawAll()
 		{
 			listViewEx.Items.Clear();
diff --git a/TBF/UI/Procedures/ProceduresCtrl.cs b/TBF/UI/Procedures/ProceduresCtrl.cs
index e55d950ea..37fc3af8e 100644
--- a/TBF/UI/Procedures/ProceduresCtrl.cs
+++ b/TBF/UI/Procedures/ProceduresCtrl.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Windows.Forms;
 using NHibernate;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
 using TBF.Resources;
@@ -100,7 +101,7 @@ namespace TBF.UI.Procedures
             if (parent == null) return;
 
             /// Create a DB session
-            session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+            session = TBF.DB.CreateSession(DBKind.Config);
             
             this.parent = parent;
 			this.parentControl = parentControl;
diff --git a/TBF/UI/Procedures/ProceduresDlg.cs b/TBF/UI/Procedures/ProceduresDlg.cs
index 02fabbe07..9c03bb1e0 100644
--- a/TBF/UI/Procedures/ProceduresDlg.cs
+++ b/TBF/UI/Procedures/ProceduresDlg.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using TBF.Resources;
 using TBF.UI.Shared;
 
@@ -24,7 +25,7 @@ namespace TBF.UI.Procedures
 			InitializeComponent();
 
 			/// SharedDlgButtons configuration
-            sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
+            sharedButtons.RequiredGroupMembership = new GID[] { GID.TestingSpecialists, GID.Metrologists };
 
 #if TEST_PROFILES
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
diff --git a/TBF/UI/Procedures/ProviderAndIx.cs b/TBF/UI/Procedures/ProviderAndIx.cs
index c91f856cc..acb239e09 100644
--- a/TBF/UI/Procedures/ProviderAndIx.cs
+++ b/TBF/UI/Procedures/ProviderAndIx.cs
@@ -1,4 +1,7 @@
-using System;
+///
+/// Copyright (c) 2021 Sensus Slovensko a.s.
+///
+using System;
 using Config.Entities;
 
 namespace TBF.UI.Procedures
diff --git a/TBF/UI/Procedures/TestParamsCtrl.cs b/TBF/UI/Procedures/TestParamsCtrl.cs
index 907f12ca9..2bf89d9ab 100644
--- a/TBF/UI/Procedures/TestParamsCtrl.cs
+++ b/TBF/UI/Procedures/TestParamsCtrl.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Common;
 using Config.Entities;
 using Results.Forms;
 using TBF.BenchControl.Generic;
diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
index 50ea15270..f6a3a3d19 100644
--- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Windows.Forms;
 using log4net;
 using Oracle.DataAccess.Client;
+using Common;
 using Config.Entities;
 using Results.Output;
 using TBF.BenchControl.GenericDevices;
@@ -194,8 +195,8 @@ namespace TBF.UI.Procedures.TestWizard
 
             foreach (var t in loadedProcedure.Tests)
             {
-                if (t.Publish != (byte)Config.Entities.Publish.Never &&
-                    t.Publish != (byte)Config.Entities.Publish.Internal &&
+                if (t.Publish != (byte)Publish.Never &&
+                    t.Publish != (byte)Publish.Internal &&
                     t.IsRegular())
                 {
                     /// This is a regular test,
diff --git a/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs b/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
index 44a9031a5..9e162b474 100644
--- a/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.BenchControl.GenericDevices;
 using TBF.Resources;
diff --git a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
index 6310b1ecb..7882a5288 100644
--- a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
@@ -54,7 +54,7 @@ namespace TBF.UI.Procedures.TestWizard
 			if (test == null) return;
 
 			volumeTextBox.Text = test.Volume.ToString();
-			durationTextBox.Text = test.TstTime.ToString();
+			durationTextBox.Text = test.TestTime.ToString();
 			errLoPctTextBox.Text = test.ErrLimLo.ToString();
 			errHiPctTextBox.Text = test.ErrLimHi.ToString();
 			uncertaintyTextBox.Text = test.Uncertainty.ToString();
@@ -92,7 +92,7 @@ namespace TBF.UI.Procedures.TestWizard
 		void UpdateTest()
 		{
 			test.Volume   = Utils.ParseUFloat(volumeTextBox.Text);
-			test.TstTime  = Utils.ParseUFloat(durationTextBox.Text);
+			test.TestTime  = Utils.ParseUFloat(durationTextBox.Text);
             test.Uncertainty = Utils.ParseUFloat(uncertaintyTextBox.Text);
 
             switch (tabId)
diff --git a/TBF/UI/Process/ProcessTabPageCtrl24.cs b/TBF/UI/Process/ProcessTabPageCtrl24.cs
index 5bdac7c27..bfdf6446c 100644
--- a/TBF/UI/Process/ProcessTabPageCtrl24.cs
+++ b/TBF/UI/Process/ProcessTabPageCtrl24.cs
@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
@@ -387,7 +388,7 @@ namespace TBF.UI.Process
 			targetFlowHighLabel.Text = args.Test.Qto.ToString("F3");
 			targetVolumeLabel.Text   = args.Test.Volume.ToString("F1");
 			targetRefCountLabel.Text = args.TotalPulses.ToString();
-			estmtdTimeLabel.Text     = args.Test.TstTime.ToString("F1");
+			estmtdTimeLabel.Text     = args.Test.TestTime.ToString("F1");
 
 			/// Names of virtual bench components
             if (args.BenchPath.PressMtrUp != null)     prInCmpntLabel.Text     = args.BenchPath.PressMtrUp.Name;
@@ -433,8 +434,8 @@ namespace TBF.UI.Process
 
 			massLabel.Text = ProcessData.Mass.ToString();
 
-			if (args.TestPhase == Config.Entities.Progress.FlowSetting ||
-				args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.FlowSetting ||
+				args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available when setting the flow and during a test
@@ -443,7 +444,7 @@ namespace TBF.UI.Process
 				refFlowLabel.Text = Utils.DoubleToStr(ProcessData.RefFlow.Val, 4);
 			}
 
-			if (args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available only during a test
diff --git a/TBF/UI/Process/ProcessTabPageCtrl48.cs b/TBF/UI/Process/ProcessTabPageCtrl48.cs
index 33f964ca2..c859fccf5 100644
--- a/TBF/UI/Process/ProcessTabPageCtrl48.cs
+++ b/TBF/UI/Process/ProcessTabPageCtrl48.cs
@@ -6,6 +6,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
@@ -416,7 +417,7 @@ namespace TBF.UI.Process
 			targetFlowHighLabel.Text = args.Test.Qto.ToString("F3");
 			targetVolumeLabel.Text   = args.Test.Volume.ToString("F1");
 			targetRefCountLabel.Text = args.TotalPulses.ToString();
-			estmtdTimeLabel.Text     = args.Test.TstTime.ToString("F1");
+			estmtdTimeLabel.Text     = args.Test.TestTime.ToString("F1");
 
 			/// Names of virtual bench components
             if (args.BenchPath.PressMtrUp != null)     prInCmpntLabel.Text     = args.BenchPath.PressMtrUp.Name;
@@ -462,8 +463,8 @@ namespace TBF.UI.Process
 			
 			massLabel.Text = ProcessData.Mass.ToString();
 
-			if (args.TestPhase == Config.Entities.Progress.FlowSetting ||
-				args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.FlowSetting ||
+				args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available when setting the flow and during a test
@@ -472,7 +473,7 @@ namespace TBF.UI.Process
 				refFlowLabel.Text = Utils.DoubleToStr(ProcessData.RefFlow.Val, 4);
 			}
 
-			if (args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available only during a test
diff --git a/TBF/UI/Process/ProcessTabPageCtrl6.cs b/TBF/UI/Process/ProcessTabPageCtrl6.cs
index 0be2a765c..c10d052ee 100644
--- a/TBF/UI/Process/ProcessTabPageCtrl6.cs
+++ b/TBF/UI/Process/ProcessTabPageCtrl6.cs
@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
@@ -403,7 +404,7 @@ namespace TBF.UI.Process
 			targetFlowHighLabel.Text = args.Test.Qto.ToString("F3");
 			targetVolumeLabel.Text   = args.Test.Volume.ToString("F1");
 			targetRefCountLabel.Text = args.TotalPulses.ToString();
-			estmtdTimeLabel.Text     = args.Test.TstTime.ToString("F1");
+			estmtdTimeLabel.Text     = args.Test.TestTime.ToString("F1");
 
 			/// Names of virtual bench components
             if (args.BenchPath.PressMtrUp != null)     prInCmpntLabel.Text     = args.BenchPath.PressMtrUp.Name;
@@ -466,8 +467,8 @@ namespace TBF.UI.Process
 
 			massLabel.Text = ProcessData.Mass.ToString();
 
-			if (args.TestPhase == Config.Entities.Progress.FlowSetting ||
-				args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.FlowSetting ||
+				args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available when setting the flow and during a test
@@ -476,7 +477,7 @@ namespace TBF.UI.Process
 				refFlowLabel.Text = Utils.DoubleToStr(ProcessData.RefFlow.Val, 4);
 			}
 
-			if (args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available only during a test
diff --git a/TBF/UI/Process/ProcessTabPageExCtrl.cs b/TBF/UI/Process/ProcessTabPageExCtrl.cs
index 8a84ffe5d..e0be66bb7 100644
--- a/TBF/UI/Process/ProcessTabPageExCtrl.cs
+++ b/TBF/UI/Process/ProcessTabPageExCtrl.cs
@@ -5,6 +5,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using Config.Entities;
 using Results.Entities;
 using TBF.BenchControl.Sequences;
@@ -370,7 +371,7 @@ namespace TBF.UI.Process
 			targetFlowHighLabel.Text = args.Test.Qto.ToString("F3");
 			targetVolumeLabel.Text   = args.Test.Volume.ToString("F1");
 			targetRefCountLabel.Text = args.TotalPulses.ToString();
-			estmtdTimeLabel.Text     = args.Test.TstTime.ToString("F1");
+			estmtdTimeLabel.Text     = args.Test.TestTime.ToString("F1");
 
 			/// Names of virtual bench components
             if (args.OutputPath.FlowMeter != null) refFlowCmpntLabel.Text = args.OutputPath.FlowMeter.Name;
@@ -432,8 +433,8 @@ namespace TBF.UI.Process
 
 			massLabel.Text = ProcessData.Mass.ToString();
 
-			if (args.TestPhase == Config.Entities.Progress.FlowSetting ||
-				args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.FlowSetting ||
+				args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available when setting the flow and during a test
@@ -442,7 +443,7 @@ namespace TBF.UI.Process
 				refFlowLabel.Text = Utils.DoubleToStr(ProcessData.RefFlow.Val, 4);
 			}
 
-			if (args.TestPhase == Config.Entities.Progress.Test)
+			if (args.TestPhase == Progress.Test)
 			{
 				///
 				/// Available only during a test
diff --git a/TBF/UI/ResultsMI/DeleteFromOracleForm.cs b/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
index c14accde9..8201e0963 100644
--- a/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
+++ b/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
@@ -4,10 +4,10 @@ using System.Text;
 using System.Windows.Forms;
 using NHibernate;
 using Oracle.DataAccess.Client;
+using Common;
 using TBF.Resources;
 using TBF.BenchControl.Output.DB.SensusOracle;
 using TBF.BenchControl.Sequences;
-using Config.Entities;
 
 namespace TBF.UI.ResultsMI
 {
diff --git a/TBF/UI/ResultsMI/PreviousResultCtrl.cs b/TBF/UI/ResultsMI/PreviousResultCtrl.cs
index cd73ec34d..90ad12017 100644
--- a/TBF/UI/ResultsMI/PreviousResultCtrl.cs
+++ b/TBF/UI/ResultsMI/PreviousResultCtrl.cs
@@ -106,7 +106,7 @@ namespace TBF.UI.ResultsMI
             else if (mode == PreviousResultsMode.Fix)
             {
                 /// Access only to thise who manage production tracing
-                Users.Entities.GID[] rqrdGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TraceabilityManagement };
+                Common.GID[] rqrdGroupMembership = new Common.GID[] { Common.GID.TraceabilityManagement };
 
                 if ((new Users.Forms.LoginDlg(Users.GlobalData.CurrentUser.UserName, rqrdGroupMembership)).ShowDialog() != DialogResult.OK)
                 {
diff --git a/TBF/UI/ResultsMI/PreviousResultsDlg.cs b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
index b0dd5a02e..fcd424567 100644
--- a/TBF/UI/ResultsMI/PreviousResultsDlg.cs
+++ b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
@@ -7,6 +7,7 @@ using System.Windows.Forms;
 using NHibernate;
 using log4net;
 using Oracle.DataAccess.Client;
+using Common;
 using Results;
 using Results.Entities;
 using TBF.BenchControl.Output.DB.SensusOracle;
@@ -209,7 +210,7 @@ namespace TBF.UI.ResultsMI
 					//}
 					//Database.WriteLogsToDisk(logger, b);
 
-                    using (ISession configSession = TBF.DB.CreateSession(Users.Entities.DBKind.Config))
+                    using (ISession configSession = TBF.DB.CreateSession(Common.DBKind.Config))
                     {
                         IList<Config.Entities.Component> cmpntEntities = configSession.QueryOver<Config.Entities.Component>()
                                                                                       .OrderBy(x => x.ItemNr).Asc
@@ -272,7 +273,7 @@ namespace TBF.UI.ResultsMI
                     }
                     foreach (var wm in b.WaterMeters)
                     {
-                        new Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, Config.Entities.PageOrientation.Portrait).Print();
+                        new Results.Output.Printers.Munich.MunichPrintDocument(docVersion, wm, PageOrientation.Portrait).Print();
                     }
 #endif
                 }
diff --git a/TBF/UI/ResultsMI/ResultsArrangementDlg.cs b/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
index fd03383c6..bf5a69ea2 100644
--- a/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
+++ b/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Config.Entities;
+using Common;
 using Results;
 using TBF.Resources;
 
@@ -15,7 +15,7 @@ namespace TBF.UI.ResultsMI
 		/// <summary>
 		/// Required access rights to make changes with this form
 		/// </summary>
-        static readonly Users.Entities.GID[] RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
+        static readonly Common.GID[] RequiredGroupMembership = new Common.GID[] { Common.GID.TestingSpecialists, Common.GID.Metrologists };
 
 		public bool Unlocked;			/// true = changes enabled
 
diff --git a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
index c32da61a8..c88a8d261 100644
--- a/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
+++ b/TBF/UI/ResultsMI/ResultsTabPageCtrl.cs
@@ -7,7 +7,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using log4net;
 using NHibernate;
-using Config.Entities;
+using Common;
 using Results;
 using Results.Forms;
 using Results.Entities;
@@ -643,7 +643,7 @@ namespace TBF.UI.ResultsMI
         private void deleteFromOracleButton_Click(object sender, EventArgs e)
         {
             /// Access only to those who manage production tracing
-            Users.Entities.GID[] rqrdGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TraceabilityManagement };
+            Common.GID[] rqrdGroupMembership = new Common.GID[] { Common.GID.TraceabilityManagement };
 
             if ((new Users.Forms.LoginDlg(Users.GlobalData.CurrentUser.UserName, rqrdGroupMembership)).ShowDialog() != DialogResult.OK)
             {
diff --git a/TBF/UI/Settings/DatabaseSettingsDlg.cs b/TBF/UI/Settings/DatabaseSettingsDlg.cs
index 537b31b62..fb3edc7ca 100644
--- a/TBF/UI/Settings/DatabaseSettingsDlg.cs
+++ b/TBF/UI/Settings/DatabaseSettingsDlg.cs
@@ -6,6 +6,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using log4net;
+using Common;
 using TBF.Resources;
 
 namespace TBF.UI.Settings
@@ -80,9 +81,9 @@ namespace TBF.UI.Settings
             realBenchCheckBox.Checked = bench.IsRealBench;
 
             /// Initialize 'Database type' combo-boxes
-			for (int i = 0; i < (int)Users.Entities.DBType.Count; i++)
+			for (int i = 0; i < (int)Common.DBType.Count; i++)
             {
-				Users.Entities.DBType dbType = (Users.Entities.DBType)i;
+				Common.DBType dbType = (Common.DBType)i;
                 configDbTypeComboBox.Items.Add(dbType);
                 resultsDbTypeComboBox.Items.Add(dbType);
                 eventsDbTypeComboBox.Items.Add(dbType);
@@ -121,10 +122,10 @@ namespace TBF.UI.Settings
             bench.EventsDBSettings.ConnectionString = eventsDbConnectionStringTextBox.Text;
             bench.UsersDBSettings.ConnectionString = usersDbConnectionStringTextBox.Text;
 
-			bench.ProceduresDBSettings.DbType = (Users.Entities.DBType)configDbTypeComboBox.SelectedIndex;
-			bench.WaterMetersDBSettings.DbType = (Users.Entities.DBType)resultsDbTypeComboBox.SelectedIndex;
-            bench.EventsDBSettings.DbType = (Users.Entities.DBType)eventsDbTypeComboBox.SelectedIndex;
-            bench.UsersDBSettings.DbType = (Users.Entities.DBType)usersDbTypeComboBox.SelectedIndex;
+			bench.ProceduresDBSettings.DbType = (Common.DBType)configDbTypeComboBox.SelectedIndex;
+			bench.WaterMetersDBSettings.DbType = (Common.DBType)resultsDbTypeComboBox.SelectedIndex;
+            bench.EventsDBSettings.DbType = (Common.DBType)eventsDbTypeComboBox.SelectedIndex;
+            bench.UsersDBSettings.DbType = (Common.DBType)usersDbTypeComboBox.SelectedIndex;
 
             return true;
         }
@@ -286,7 +287,7 @@ namespace TBF.UI.Settings
                     log.ErrorFormat("Going to create an empty events database '{0}'", databaseName);
                     ExecuteMySqlCmd(string.Format("DROP DATABASE `{0}`;", databaseName), userName, password);
                     ExecuteMySqlCmd(string.Format("CREATE DATABASE `{0}` CHARACTER SET utf8 COLLATE utf8_unicode_ci;", databaseName), userName, password);
-                    global::Events.DB.DbType = (Events.Entities.DBType)bench.EventsDBSettings.DbType;
+                    global::Events.DB.DbType = (DBType)bench.EventsDBSettings.DbType;
                     global::Events.DB.ConnectionString = connectionString;
                     global::Events.DB.CreateEmptyDB();
                     log.ErrorFormat("An empty events database '{0}' was created", databaseName);
diff --git a/TBF/UI/Settings/GroupTableRow.cs b/TBF/UI/Settings/GroupTableRow.cs
index 4a3b9ee9e..195a9d452 100644
--- a/TBF/UI/Settings/GroupTableRow.cs
+++ b/TBF/UI/Settings/GroupTableRow.cs
@@ -6,10 +6,10 @@ namespace TBF.UI.Settings
     public class GroupTableRow
     {
         public int GroupId;
-        public Users.Entities.GID Gid;
+        public Common.GID Gid;
         public int UserId;
 
-        public GroupTableRow(int groupId, Users.Entities.GID gid, int userId)
+        public GroupTableRow(int groupId, Common.GID gid, int userId)
         {
             GroupId = groupId;
             Gid = gid;
diff --git a/TBF/UI/Settings/UpgradeSelectionDlg.cs b/TBF/UI/Settings/UpgradeSelectionDlg.cs
index d241eb5b0..0222b1dfb 100644
--- a/TBF/UI/Settings/UpgradeSelectionDlg.cs
+++ b/TBF/UI/Settings/UpgradeSelectionDlg.cs
@@ -116,7 +116,7 @@ namespace TBF.UI.Settings
 
             try
             {
-                session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                session = TBF.DB.CreateSession(Common.DBKind.Config);
 
                 var testParams = session.QueryOver<Config.Entities.ComponentTest>()
                                         .Where(x => (x.CmpntName == errorFlagsCmpntName))
@@ -839,7 +839,7 @@ namespace TBF.UI.Settings
                 cmd.ExecuteNonQuery();
                 cmd.Dispose();
 
-                int[] groupIdsToKeep = new int[(int)Users.Entities.GID.NrOfGroups];
+                int[] groupIdsToKeep = new int[(int)Common.GID.NrOfGroups];
                 IList<GroupTableRow> groupTable = new List<GroupTableRow>();
 
                 cmd = dbConn.CreateCommand();
@@ -848,12 +848,12 @@ namespace TBF.UI.Settings
                 while (dr.Read())
                 {
                     int groupId = dr.GetInt32(0);
-                    Users.Entities.GID gid = (Users.Entities.GID)dr.GetInt32(1);
+                    Common.GID gid = (Common.GID)dr.GetInt32(1);
                     int userId = dr.GetInt32(2);
 
                     groupTable.Add(new GroupTableRow(groupId, gid, userId));
 
-                    if ((gid >= 0) && (gid < Users.Entities.GID.NrOfGroups) && (groupIdsToKeep[(int)gid] == 0))
+                    if ((gid >= 0) && (gid < Common.GID.NrOfGroups) && (groupIdsToKeep[(int)gid] == 0))
                     {
                         groupIdsToKeep[(int)gid] = groupId;
                     }
@@ -1049,7 +1049,7 @@ namespace TBF.UI.Settings
 
             try
             {
-                ISession session = TBF.DB.CreateSession(Users.Entities.DBKind.Config);
+                ISession session = TBF.DB.CreateSession(Common.DBKind.Config);
 
                 var proceduresToModify = session.QueryOver<Config.Entities.ComponentProcedure>()
                                                 .Where(x => x.CmpntName == "Sensus-Oracle-DB")
diff --git a/TBF/UI/Shared/BenchControlPanel.cs b/TBF/UI/Shared/BenchControlPanel.cs
index 17865b312..b0e5233ee 100644
--- a/TBF/UI/Shared/BenchControlPanel.cs
+++ b/TBF/UI/Shared/BenchControlPanel.cs
@@ -181,9 +181,9 @@ namespace TBF.UI.Shared
 			string oriTestName = testComboBox.Text;
 
             IList<Procedure> procedures = TBF.DB.CreateSession(Program.MainWnd.SelectedProcedure.IsRemote ?
-                                                                            Users.Entities.DBKind.RemoteConfig : Users.Entities.DBKind.Config)
+                                                                            Common.DBKind.RemoteConfig : Common.DBKind.Config)
                                                              .QueryOver<Procedure>()
-                                                             .Where(x => (x.ProcedureState == ProcedureState.Active))
+                                                             .Where(x => (x.ProcedureState == Common.ProcedureState.Active))
                                                              .And(x => (x.Name == Program.MainWnd.SelectedProcedure.Name))
                                                              .List();
 			if (procedures.Count != 1)
@@ -277,9 +277,9 @@ namespace TBF.UI.Shared
 		{
 #if TURA_IPERL || TURA_IPERL_NEW
             /// Prevent 'Stop draining' by password
-            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.TestingSpecialists))
+            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.TestingSpecialists))
             {
-                if ((new Users.Forms.LoginDlg(new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
+                if ((new Users.Forms.LoginDlg(new Common.GID[] { Common.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
 					return;
 
     			if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
@@ -294,9 +294,9 @@ namespace TBF.UI.Shared
 		{
 #if TURA_IPERL || TURA_IPERL_NEW
             /// Prevent 'Stop draining' by password
-            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.TestingSpecialists))
+            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.TestingSpecialists))
             {
-                if ((new Users.Forms.LoginDlg(new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
+                if ((new Users.Forms.LoginDlg(new Common.GID[] { Common.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
                     return;
 
                 if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
@@ -311,9 +311,9 @@ namespace TBF.UI.Shared
 		{
 #if TURA_IPERL || TURA_IPERL_NEW
             /// Prevent 'Stop draining' by password
-            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.TestingSpecialists))
+            if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Common.GID.TestingSpecialists))
             {
-                if ((new Users.Forms.LoginDlg(new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
+                if ((new Users.Forms.LoginDlg(new Common.GID[] { Common.GID.TestingSpecialists })).ShowDialog() != DialogResult.OK)
                     return;
 
                 if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
diff --git a/TBF/UI/Shared/LoginDlgWithBenchSelection.cs b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
index 417a765d4..f512294c7 100644
--- a/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
+++ b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
@@ -33,7 +33,7 @@ namespace TBF.UI.Shared
         public string Alias { get { return alias; } }
         public string Password { get { return password; } }
         public string BenchName { get { return benchName; } }
-		public Users.Entities.LoginMethod Method;
+		public Common.LoginMethod Method;
         public string Legalizator { get { return legalizator; } }
 
         /// <summary>
@@ -162,9 +162,9 @@ namespace TBF.UI.Shared
 			switch (Method)
 			{
 				default:
-				case Users.Entities.LoginMethod.UserName: return Strings.User_name;
-				case Users.Entities.LoginMethod.FullName: return Strings.Full_name;
-				case Users.Entities.LoginMethod.Number: return Strings.User_code;
+				case Common.LoginMethod.UserName: return Strings.User_name;
+				case Common.LoginMethod.FullName: return Strings.Full_name;
+				case Common.LoginMethod.Number: return Strings.User_code;
 			}
 		}
 
@@ -232,7 +232,7 @@ namespace TBF.UI.Shared
 		private void aliasLabel_Click(object sender, EventArgs e)
 		{
 			Method++;
-			if (Method == Users.Entities.LoginMethod.Count)
+			if (Method == Common.LoginMethod.Count)
 				Method = 0;
 			aliasLabel.Text = GetAliasLabel();
 		}
diff --git a/TBF/UI/Shared/SharedButtons.cs b/TBF/UI/Shared/SharedButtons.cs
index 75e06ca5e..6f945d6f7 100644
--- a/TBF/UI/Shared/SharedButtons.cs
+++ b/TBF/UI/Shared/SharedButtons.cs
@@ -72,7 +72,7 @@ namespace TBF.UI.Shared
 			Middle,
 		}
 
-		public Users.Entities.GID[] RequiredGroupMembership;
+		public Common.GID[] RequiredGroupMembership;
 
         Users.Entities.User originalUser;
 
diff --git a/TBF/UiBridge/Bridge.cs b/TBF/UiBridge/Bridge.cs
index 5c0267107..8f0497b2f 100644
--- a/TBF/UiBridge/Bridge.cs
+++ b/TBF/UiBridge/Bridge.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using log4net;
 using NHibernate;
+using Common;
 using Config.Entities;
 using Events.Entities;
 
diff --git a/TBF/UiBridge/ProcessDataEventArgs.cs b/TBF/UiBridge/ProcessDataEventArgs.cs
index bc434913b..a3681a6f7 100644
--- a/TBF/UiBridge/ProcessDataEventArgs.cs
+++ b/TBF/UiBridge/ProcessDataEventArgs.cs
@@ -1,7 +1,8 @@
 ///
-/// Copyright (c) 2016-2017 Sensus Metering Systems
+/// Copyright (c) 2016-2017 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 using Config.Entities;
 
 namespace TBF.UiBridge
diff --git a/TBF/UiBridge/TestProgressEventArgs.cs b/TBF/UiBridge/TestProgressEventArgs.cs
index f28dbef42..e1fd21655 100644
--- a/TBF/UiBridge/TestProgressEventArgs.cs
+++ b/TBF/UiBridge/TestProgressEventArgs.cs
@@ -2,6 +2,9 @@
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
+using Common;
+using Config.Entities;
+using Results.Entities;
 
 namespace TBF.UiBridge
 {
@@ -12,7 +15,7 @@ namespace TBF.UiBridge
 		public int Repeats;
 		public int RepetitionNr;
 
-        public Config.Entities.Progress Phase;
+        public Progress Phase;
 		public int Progress;                /// value in the range 0..100
 		public float OveralProgress;
 
@@ -22,28 +25,28 @@ namespace TBF.UiBridge
 		static int[] estimatedTime;						/// Estimated time of each phase to calculate the progress [s]
 		static int[] cumulativeSumsOfEstimates;
 		static int currentPhaseStartTime;
-		static Config.Entities.Progress currentPhase;
+		static Progress currentPhase;
 
 
 		static TestProgressEventArgs()
 		{
-			int[] estTime = new int[(int)Config.Entities.Progress.Count];
+            int[] estTime = new int[(int)Common.Progress.Count];
 			for (int i = 0; i < estTime.Length; i++) estTime[i] = 10;
-			cumulativeSumsOfEstimates = new int[(int)Config.Entities.Progress.Count];
+            cumulativeSumsOfEstimates = new int[(int)Common.Progress.Count];
 			SetEstimatedTimes(estTime);
 
 			currentPhaseStartTime = BenchControl.StateMachine.Time;
-			currentPhase = Config.Entities.Progress.JustStarted;
+            currentPhase = Common.Progress.JustStarted;
 		}
 
 
 		/// <summary>
-		/// Set estimated time of each phase in [s] (see Config.Entities.Progress).
+		/// Set estimated time of each phase in [s] (see Progress).
 		/// </summary>
 		/// <param name="estTime">Array: estimated time of each phase in [s]</param>
 		public static void SetEstimatedTimes(int[] estTime)
 		{
-			if (estTime.Length != (int)Config.Entities.Progress.Count) return;
+            if (estTime.Length != (int)Common.Progress.Count) return;
 			estimatedTime = estTime;
 			for (int i = 0; i < estTime.Length; i++)
 			{
@@ -58,7 +61,7 @@ namespace TBF.UiBridge
 		/// and calculates 'Progress'.
 		/// </summary>
 		/// <param name="progress"></param>
-		private TestProgressEventArgs(Config.Entities.Progress phase)
+		private TestProgressEventArgs(Progress phase)
 		{
 			if (phase != currentPhase)
 			{
@@ -72,16 +75,16 @@ namespace TBF.UiBridge
             int currentPhaseTime = Math.Min(BenchControl.StateMachine.Time - currentPhaseStartTime, estimatedTime[phaseNr]);
 			int currentTestTime = currentPhaseTime + ((phaseNr == 0) ? 0 : cumulativeSumsOfEstimates[phaseNr - 1]);
 			
-            int add10pct = cumulativeSumsOfEstimates[(int)Config.Entities.Progress.Count - 1] / 9;
+            int add10pct = cumulativeSumsOfEstimates[(int)Common.Progress.Count - 1] / 9;
 
 
 			Progress = 100 * (currentTestTime + add10pct)
-                     / (cumulativeSumsOfEstimates[(int)Config.Entities.Progress.Count - 1] + add10pct);
+                     / (cumulativeSumsOfEstimates[(int)Common.Progress.Count - 1] + add10pct);
 		}
 
 #endregion
 
-		public TestProgressEventArgs(Config.Entities.Test test, int repetitionNr, Config.Entities.Progress progress)
+		public TestProgressEventArgs(Test test, int repetitionNr, Progress progress)
 			: this(progress)
 		{
 			TestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr);
@@ -90,7 +93,7 @@ namespace TBF.UiBridge
 			RepetitionNr = repetitionNr;
 		}
 
-		public TestProgressEventArgs(Config.Entities.Test test, Config.Entities.Progress progress)
+		public TestProgressEventArgs(Test test, Progress progress)
 			: this(test, 1, progress)
 		{
 		}
@@ -99,7 +102,7 @@ namespace TBF.UiBridge
         /// From TestRslt.
         /// Used after restore of an interupted session
         /// </summary>
-        public TestProgressEventArgs(Results.Entities.TestRslt testRslt)
+        public TestProgressEventArgs(TestRslt testRslt)
         {
             TestName = testRslt.Name();
             Part = testRslt.Part;
@@ -111,7 +114,7 @@ namespace TBF.UiBridge
 		/// <summary>
 		/// Used by iPearl communication dialog
 		/// </summary>
-		public TestProgressEventArgs(string testName, Config.Entities.Progress progress)
+		public TestProgressEventArgs(string testName, Progress progress)
 			: this(progress)
 		{
 			TestName = testName;
diff --git a/UserManagement/LocalSettings.cs b/UserManagement/LocalSettings.cs
index cd9e1aaec..71d754a00 100644
--- a/UserManagement/LocalSettings.cs
+++ b/UserManagement/LocalSettings.cs
@@ -7,6 +7,7 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Xml.Serialization;
 using log4net;
+using Common;
 
 namespace UserManagement
 {
@@ -40,7 +41,7 @@ namespace UserManagement
 		/// <summary>
 		/// Login method: UserName, FullName or Number
 		/// </summary>
-		public Users.Entities.LoginMethod LoginMethod;
+		public LoginMethod LoginMethod;
 
 		
         public LocalSettings()
diff --git a/UserManagement/UserManagement.csproj b/UserManagement/UserManagement.csproj
index dd025d035..3de0dc6b7 100644
--- a/UserManagement/UserManagement.csproj
+++ b/UserManagement/UserManagement.csproj
@@ -125,6 +125,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Users\Users.csproj">
       <Project>{6E5CB0E9-E1B6-4E5D-AC6E-B1049E180F2B}</Project>
       <Name>Users</Name>
diff --git a/Users/DB.cs b/Users/DB.cs
index bb94aa345..c4c628a2b 100644
--- a/Users/DB.cs
+++ b/Users/DB.cs
@@ -9,6 +9,7 @@ using log4net;
 using NHibernate;
 using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
+using Common;
 using Users.Entities;
 
 namespace Users
diff --git a/Users/DBSettings.cs b/Users/DBSettings.cs
index 0c478f0a4..ce9ff7f30 100644
--- a/Users/DBSettings.cs
+++ b/Users/DBSettings.cs
@@ -1,7 +1,8 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 
 namespace Users
 {
@@ -10,14 +11,14 @@ namespace Users
 	/// </summary>
 	public class DBSettings : ICloneable
 	{
-		public Users.Entities.DBType DbType;
+		public DBType DbType;
 		public string ConnectionString;
 
 		public DBSettings()
 		{
 		}
 
-		public DBSettings(Users.Entities.DBType dbType, string connectionString)
+		public DBSettings(DBType dbType, string connectionString)
 		{
 			this.DbType = dbType;
 			this.ConnectionString = connectionString;
diff --git a/Users/Entities/Enums.cs b/Users/Entities/Enums.cs
deleted file mode 100644
index aee6e97b2..000000000
--- a/Users/Entities/Enums.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-///
-/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
-///
-using System;
-
-namespace Users.Entities
-{
-    /// <summary> Identifies the type of a database </summary>
-    public enum DBType
-    {
-        None,               /// Database disabled
-        MySql,              /// MySQL database
-        SQLite,             /// SQLite
-        Count
-    }
-
-    /// <summary> Identifies the database based on the content </summary>
-    public enum DBKind
-    {
-        Config,
-        Results,
-        RemoteConfig,
-        Count
-    }
-
-    public enum LoginMethod
-    {
-        UserName,		/// = alias, abbreviation
-        FullName,		/// = description
-        Number,
-        Count
-    }
-
-	public enum AuthorizedAs
-	{
-		PowerUser,
-		LocalUser,
-		RemoteUser,
-		Count
-	}
-
-    /// <summary>
-    /// GID-s of user groups, each user is member of one or more groups.
-    /// </summary>
-    public enum GID
-    {
-        Testers,
-        TestingSpecialists,
-        HeadOfLab,
-        MaintenanceSpecialists,
-        Metrologists,
-        CalibrationSpecialists,
-        Administrators,             /// application / network / database administrator
-        TraceabilityManagement,
-        MetrologicalAuthority,
-        WaterMeterAuthority,
-        NrOfGroups,                 /// Number of groups (this is not a GroupID)
-    }
-}
diff --git a/Users/Entities/Group.cs b/Users/Entities/Group.cs
index 67d08d470..edd166e55 100644
--- a/Users/Entities/Group.cs
+++ b/Users/Entities/Group.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Collections.Generic;
+using Common;
 using Users.Resources;
 
 namespace Users.Entities
diff --git a/Users/Entities/User.cs b/Users/Entities/User.cs
index 98a9758da..91e1a2601 100644
--- a/Users/Entities/User.cs
+++ b/Users/Entities/User.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Text;
 using log4net;
+using Common;
 using Users.Forms;
 using Users.Resources;
 
diff --git a/Users/Forms/ListViewExtensions.cs b/Users/Forms/ListViewExtensions.cs
index f777600bd..03bb9a207 100644
--- a/Users/Forms/ListViewExtensions.cs
+++ b/Users/Forms/ListViewExtensions.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using Common;
 
 namespace Users.Forms
 {
diff --git a/Users/Forms/LoginDlg.cs b/Users/Forms/LoginDlg.cs
index 99f863d4a..b205f21f6 100644
--- a/Users/Forms/LoginDlg.cs
+++ b/Users/Forms/LoginDlg.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using GemCard;
 using Users.Entities;
 using Users.Resources;
@@ -30,7 +31,7 @@ namespace Users.Forms
         GemCard.CardNative card;
         string smartCardReader;
 
-		public Users.Entities.LoginMethod Method;
+		public Common.LoginMethod Method;
 		public string VersionString;
 
         /// <summary>
@@ -162,9 +163,9 @@ namespace Users.Forms
 			switch (Method)
 			{
 				default:
-				case Entities.LoginMethod.UserName: return Strings.User_name;
-				case Entities.LoginMethod.FullName: return Strings.Full_name;
-				case Entities.LoginMethod.Number: return Strings.User_code;
+				case LoginMethod.UserName: return Strings.User_name;
+				case LoginMethod.FullName: return Strings.Full_name;
+				case LoginMethod.Number: return Strings.User_code;
 			}
 		}
 
@@ -176,7 +177,7 @@ namespace Users.Forms
             user = userNameTextBox.Text;
             password = passwordTextBox.Text;
 
-			Entities.AuthorizedAs authorizedAs = Entities.AuthorizedAs.PowerUser;
+			AuthorizedAs authorizedAs = AuthorizedAs.PowerUser;
 
 			bool authorized = Entities.User.IsPowerUser(user, password);
 			if (authorized)
@@ -187,7 +188,7 @@ namespace Users.Forms
 			if (!authorized && !noDatabase)
 			{
 				DBSettings[] dbs = new DBSettings[] { GlobalData.RemoteUsersDB, GlobalData.LocalUsersDB };
-				authorizedAs = Entities.AuthorizedAs.RemoteUser;
+				authorizedAs = AuthorizedAs.RemoteUser;
 
 				foreach (var db in dbs)
 				{
@@ -195,19 +196,19 @@ namespace Users.Forms
                     {
                         switch (Method)
                         {
-                            case Entities.LoginMethod.UserName:
+                            case LoginMethod.UserName:
                             default:
                                 var usr1 = Users.Entities.User.LoadUserByName(user, db);
                                 if (usr1 != null) { authorized = usr1.Authorize(user, password, requiredGroupMembership); }
                                 break;
 
-                            case Entities.LoginMethod.FullName:
+                            case LoginMethod.FullName:
                                 var usr2 = Users.Entities.User.LoadUserByFullName(user, db);
                                 if (usr2 != null) { authorized = usr2.AuthorizeFullName(user, password, requiredGroupMembership); }
                                 if (authorized) { user = usr2.UserName; }
                                 break;
 
-                            case Entities.LoginMethod.Number:
+                            case LoginMethod.Number:
                                 int number;
                                 if (!int.TryParse(user, out number)) break;
                                 var usr3 = Users.Entities.User.LoadUserByNumber(number, db);
@@ -220,7 +221,7 @@ namespace Users.Forms
 
                     if (authorized) break;
 
-					authorizedAs = Entities.AuthorizedAs.LocalUser;
+					authorizedAs = AuthorizedAs.LocalUser;
 				}
 			}
 
@@ -254,7 +255,7 @@ namespace Users.Forms
 
 		private void aliasLabel_Click(object sender, EventArgs e)
 		{
-			if (++Method == Entities.LoginMethod.Count) Method = 0;
+			if (++Method == LoginMethod.Count) Method = 0;
 
 			aliasLabel.Text = GetAliasLabel();
 		}
@@ -289,7 +290,7 @@ namespace Users.Forms
 
             DBSettings[] dbs = new DBSettings[] { GlobalData.RemoteUsersDB, GlobalData.LocalUsersDB };
             bool authorized = false;
-            Entities.AuthorizedAs authorizedAs = Entities.AuthorizedAs.RemoteUser;
+            AuthorizedAs authorizedAs = AuthorizedAs.RemoteUser;
             ///
             foreach (var db in dbs)
             {
@@ -309,7 +310,7 @@ namespace Users.Forms
                 }
                 catch (Exception) { }
 
-                authorizedAs = Entities.AuthorizedAs.LocalUser;
+                authorizedAs = AuthorizedAs.LocalUser;
             }
 
             if (authorized)
diff --git a/Users/Forms/LviIntColumnComparer.cs b/Users/Forms/LviIntColumnComparer.cs
index 960da5b00..4d50c28c6 100644
--- a/Users/Forms/LviIntColumnComparer.cs
+++ b/Users/Forms/LviIntColumnComparer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Windows.Forms;
+using Common;
 
 namespace Users.Forms
 {
diff --git a/Users/Forms/LviNameSurnameColumnComparer.cs b/Users/Forms/LviNameSurnameColumnComparer.cs
index 70957a42f..0fa84703a 100644
--- a/Users/Forms/LviNameSurnameColumnComparer.cs
+++ b/Users/Forms/LviNameSurnameColumnComparer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Windows.Forms;
+using Common;
 
 namespace Users.Forms
 {
diff --git a/Users/Forms/LviTextColumnComparer.cs b/Users/Forms/LviTextColumnComparer.cs
index 03472f581..82e88019a 100644
--- a/Users/Forms/LviTextColumnComparer.cs
+++ b/Users/Forms/LviTextColumnComparer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Windows.Forms;
+using Common;
 
 namespace Users.Forms
 {
diff --git a/Users/Forms/PasswordChangeDlg.cs b/Users/Forms/PasswordChangeDlg.cs
index cdb4a27c0..8924abf2a 100644
--- a/Users/Forms/PasswordChangeDlg.cs
+++ b/Users/Forms/PasswordChangeDlg.cs
@@ -3,6 +3,7 @@
 ///
 using System;
 using System.Windows.Forms;
+using Common;
 using GemCard;
 using Users.Resources;
 using System.Drawing;
@@ -90,7 +91,7 @@ namespace Users.Forms
                 return;
             }
 
-            Entities.AuthorizedAs authorizedAs = Entities.AuthorizedAs.RemoteUser;
+            AuthorizedAs authorizedAs = AuthorizedAs.RemoteUser;
             Users.Entities.User loadedUser = null;
             ///
             bool oldPasswdOK = false;
@@ -112,7 +113,7 @@ namespace Users.Forms
 
                     if (oldPasswdOK) break;
 
-					authorizedAs = Entities.AuthorizedAs.LocalUser;
+					authorizedAs = AuthorizedAs.LocalUser;
 				}
 			}
 
diff --git a/Users/Forms/UserManagementDlg.cs b/Users/Forms/UserManagementDlg.cs
index 53f101853..ca9266458 100644
--- a/Users/Forms/UserManagementDlg.cs
+++ b/Users/Forms/UserManagementDlg.cs
@@ -5,21 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using NHibernate;
+using Common;
 using Users.Entities;
 using Users.Resources;
 
 
 namespace Users.Forms
 {
-    public enum MySortOrder
-    {
-        None,
-        Ascending,      /// Th esame like SortOrder.Ascending
-        Descending,     /// The same like SortOrder.Descending
-        Ascending2,     /// Sorts by a surname in ascending order in case or 'Name Surname' column
-        Descending2,    /// Sorts by a surname in descending order in case or 'Name Surname' column
-    }
-
     public partial class UserManagementDlg: Form
     {
         const int UserNumberColumn = 1;
@@ -53,10 +45,10 @@ namespace Users.Forms
                 ///
                 /// Selects groups to be displayed (so that each GID is present only once)
                 ///
-                Group[] dspGroups = new Group[(int)Users.Entities.GID.NrOfGroups];
+                Group[] dspGroups = new Group[(int)Common.GID.NrOfGroups];
                 foreach (var group in allGroups)
                 {
-                    if ((group.GID >= 0) && (group.GID < Users.Entities.GID.NrOfGroups) && (dspGroups[(int)group.GID] == null))
+                    if ((group.GID >= 0) && (group.GID < Common.GID.NrOfGroups) && (dspGroups[(int)group.GID] == null))
                     {
                         dspGroups[(int)group.GID] = group;
                     }
diff --git a/Users/GlobalData.cs b/Users/GlobalData.cs
index 065a02dde..9b4454310 100644
--- a/Users/GlobalData.cs
+++ b/Users/GlobalData.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2016-2019 Sensus Slovensko a.s.
 ///
 using System;
+using Common;
 
 namespace Users
 {
@@ -11,7 +12,7 @@ namespace Users
 		public static DBSettings LocalUsersDB = null;
 
         public static Entities.User CurrentUser;
-		public static Entities.AuthorizedAs AuthorizedAs;
+		public static AuthorizedAs AuthorizedAs;
 		public static DateTime LastAuthorization = DateTime.Now;
 
         public static int MinPasswdLength = 0;
diff --git a/Users/Users.csproj b/Users/Users.csproj
index 1953542e4..4ef5ad96c 100644
--- a/Users/Users.csproj
+++ b/Users/Users.csproj
@@ -73,7 +73,6 @@
     </Compile>
     <Compile Include="GlobalData.cs" />
     <Compile Include="DB.cs" />
-    <Compile Include="Entities\Enums.cs" />
     <Compile Include="Entities\Group.cs" />
     <Compile Include="Entities\User.cs" />
     <Compile Include="Forms\EditSelectedUser.cs">
@@ -104,6 +103,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.csproj">
+      <Project>{c8939821-ba5c-4988-a3d0-bf53b74865c7}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GemCard\GemCard.csproj">
       <Project>{8B10D15A-39DE-4B56-8DD1-710C1EB3A697}</Project>
       <Name>GemCard</Name>