diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProcessStates.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProcessStates.cs
index c3d6a409..20627021 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProcessStates.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/BaseProcessStates.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.CompilerServices;
 using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Enum;
+using Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.GenericProcesses;
+using Xylem.Common.Production.ProductionUiCordonel.Properties;
+
 
 namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses
 {
@@ -17,13 +19,71 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses
         /// <summary>
         /// Collection of state information
         /// </summary>
-        protected List<ProcessStateStruct> StateContainer { set; get; }
+        protected List<ProcessStateStruct> StateContainer { get; }
 
         /// <summary>
-        /// Ctor
+        /// Ctor:
+        /// Initialize all hidden standard generic states
         /// </summary>
         protected BaseProcessStates()
         {
+             StateContainer = new List<ProcessStateStruct>
+             {
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.Idle,
+                    Resources.StrStateIdle,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.CheckNewMeter,
+                    Resources.StrProcessStateCheckNewMeter,
+                    null),
+
+                new ProcessStateStruct(
+                    new ErrorHandler(null),
+                    ProcessState.Error,
+                    Resources.StrProcessStateError,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.RepeatFailedTests,
+                    Resources.StrStateRepeatFinalTest,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.AbortTest,
+                    Resources.StrStateSkipping,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.Stop,
+                    Resources.StrStateUserStop,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.TestFailed,
+                    Resources.StrStateFinalTestFailed,
+                    null),
+
+                 new ProcessStateStruct(
+                    null,
+                    ProcessState.PrintSuccessReport,
+                    Resources.StrStatePrintSuccessReport,
+                    null),
+
+                new ProcessStateStruct(
+                    null,
+                    ProcessState.PrintReturnReport,
+                    Resources.StrStatePrintReturnReport,
+                    null),
+
+            };
         }
 
         /// <summary>
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/EolProcessStates.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/EolProcessStates.cs
index ad05f59f..8d792cbf 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/EolProcessStates.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/EolProcessStates.cs
@@ -25,68 +25,14 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolPr
         /// </summary>
         public EolProcessStates()
         {
-            StateContainer = new List<ProcessStateStruct>
+            var stateContainer = new List<ProcessStateStruct>
             {
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.Idle,
-                    Resources.StrStateIdle,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.CheckNewMeter,
-                    Resources.StrProcessStateCheckNewMeter,
-                    null),
-
-                new ProcessStateStruct(
-                    new ErrorHandler(null),
-                    ProcessState.Error,
-                    Resources.StrProcessStateError,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.RepeatFailedTests,
-                    Resources.StrStateRepeatFinalTest,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.AbortTest,
-                    Resources.StrStateSkipping,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.Stop,
-                    Resources.StrStateUserStop,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.TestFailed,
-                    Resources.StrStateFinalTestFailed,
-                    null),
-
                 new ProcessStateStruct(
                     null,
                     ProcessState.ReadyForShipping,
                     Resources.StrStateReadyForShipping,
                     null),
 
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.PrintSuccessReport,
-                    Resources.StrStatePrintSuccessReport,
-                    null),
-
-                new ProcessStateStruct(
-                    null,
-                    ProcessState.PrintReturnReport,
-                    Resources.StrStatePrintReturnReport,
-                    null),
-
                 new ProcessStateStruct(
                     new DetectCordonel(Resources.StrStateDetectCordonel),
                     ProcessState.DetectCordonel,
@@ -182,6 +128,7 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolPr
                     Resources.StrStatePrepareShipping,
                     15)
             };
+            StateContainer.AddRange(stateContainer);
         }
     }
 }