diff --git a/commdll/Include/GPVisionHS.h b/commdll/Include/GPVisionHS.h
index 1c8e314..43bbcf9 100644
--- a/commdll/Include/GPVisionHS.h
+++ b/commdll/Include/GPVisionHS.h
@@ -4,6 +4,11 @@
 
 #pragma once
 
+#include <map>
+#include <memory>
+#include <vector>
+#include <bitset>
+
 #include "GPVision.h"
 #include "FileLog.h"
 #include "VisionMultiUnitResult.h"
@@ -11,11 +16,6 @@
 
 #include "KeyValue.h"
 
-#include <map>
-#include <memory>
-#include <vector>
-#include <bitset>
-
 #ifdef BUILD_COMMDLL
 #define COMMDLL_DLLCLASS __declspec(dllexport)
 #else
diff --git a/commdll/Include/KeyenceBL600.h b/commdll/Include/KeyenceBL600.h
index 5c7ed4c..5a6ceea 100644
--- a/commdll/Include/KeyenceBL600.h
+++ b/commdll/Include/KeyenceBL600.h
@@ -3,8 +3,8 @@
 //////////////////////////////////////////////////////////////////////
 #pragma once
 
-
 #include <string>
+
 #include "Scanner.h"
 #include "Utility.h"
 
diff --git a/commdll/Include/MEyeVision.h b/commdll/Include/MEyeVision.h
index 90e9dd0..ac28f2c 100644
--- a/commdll/Include/MEyeVision.h
+++ b/commdll/Include/MEyeVision.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "GPVision.h"
-
 #include <map>
 #include <memory>
 #include <vector>
@@ -111,6 +109,17 @@ public:
         MOD_GPI                    = 0x40000000,
     };
 
+    enum class TYPE_ID
+    {
+        TYPE1 = 1,
+        TYPE2,
+        TYPE3,
+        TYPE4,
+        TYPE5,
+        TYPE6,
+        TYPE7,
+    };
+
     enum class RESOLUTION
     {
         X = 1,
@@ -142,7 +151,7 @@ public:
         GOOD,
     };
 
-    CMEyeVision(const std::string& strMutexName = _T("vision_mutex"), size_t nMaxStation = MAX_VISION_STATION);
+    CMEyeVision(const std::string& strMutexName = _T("vision_mutex"), size_t nMaxStation = VISION_BASE::MAX_VISION_STATION);
     ~CMEyeVision() final;
 
     bool StartPatternLocationInspection(int nStationNo, PATTERN_LOCATION_TYPE eType);
@@ -367,12 +376,12 @@ private:
     std::vector<int>    m_nInspectSeq;
     std::vector<string> m_strUniqueId; // For tracking of unique Id issue upon inspection
     //
-    bitset<MAX_VISION_STATION> m_bsStartBufferingMode;
-    bitset<MAX_VISION_STATION> m_bsModuleStatusEnable;
-    bitset<MAX_VISION_STATION> m_bsSemiT10Enable;
-    bitset<MAX_VISION_STATION> m_bsTeachingValid;
-    bitset<MAX_VISION_STATION> m_bsDiagResultAlwaysGood;
-    bitset<MAX_VISION_STATION> m_bsDiagLogDataEnable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsStartBufferingMode;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsModuleStatusEnable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsSemiT10Enable;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsTeachingValid;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsDiagResultAlwaysGood;
+    bitset<VISION_BASE::MAX_VISION_STATION> m_bsDiagLogDataEnable;
 
     //
     std::map<int, std::map<int, CVisionResult::XYT_PVI_PARAM>> m_mapDataSetConfig;
diff --git a/commdll/Include/NuDAM.h b/commdll/Include/NuDAM.h
index a00133b..70b96c2 100644
--- a/commdll/Include/NuDAM.h
+++ b/commdll/Include/NuDAM.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 #include "Utility.h"
 #include "SerialPort.h"
diff --git a/commdll/Include/OmronCompoWayF.h b/commdll/Include/OmronCompoWayF.h
index bbdbd9a..866a2f1 100644
--- a/commdll/Include/OmronCompoWayF.h
+++ b/commdll/Include/OmronCompoWayF.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 
 #ifdef BUILD_COMMDLL
diff --git a/commdll/Include/OmronLaserScanner.h b/commdll/Include/OmronLaserScanner.h
index 378e94d..28b4893 100644
--- a/commdll/Include/OmronLaserScanner.h
+++ b/commdll/Include/OmronLaserScanner.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "Scanner.h"
 
 #ifdef BUILD_COMMDLL
diff --git a/commdll/Include/OmronTempCtrlE5CN.h b/commdll/Include/OmronTempCtrlE5CN.h
index be945ce..02e5d76 100644
--- a/commdll/Include/OmronTempCtrlE5CN.h
+++ b/commdll/Include/OmronTempCtrlE5CN.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "OmronCompoWayF.h"
 
 #ifdef  BUILD_COMMDLL
diff --git a/commdll/Include/RSLaser.h b/commdll/Include/RSLaser.h
index cb2f4a5..6c76031 100644
--- a/commdll/Include/RSLaser.h
+++ b/commdll/Include/RSLaser.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "VisionNW.h"
 #include "Utility.h"
 
diff --git a/commdll/Include/RfID_Omron600.h b/commdll/Include/RfID_Omron600.h
index a6e195b..0279033 100644
--- a/commdll/Include/RfID_Omron600.h
+++ b/commdll/Include/RfID_Omron600.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <string>
+
 #include "utility.h"
 #include "RfId.h"
 #include "RfIdFactory.h"
diff --git a/commdll/Include/RfId.h b/commdll/Include/RfId.h
index aa7deff..337273c 100644
--- a/commdll/Include/RfId.h
+++ b/commdll/Include/RfId.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <memory>
 #include <string>
+
 #include "Utility.h"
 
 #ifdef  BUILD_COMMDLL
diff --git a/commdll/Include/VisionResult.h b/commdll/Include/VisionResult.h
index fca9765..0528cda 100644
--- a/commdll/Include/VisionResult.h
+++ b/commdll/Include/VisionResult.h
@@ -3,8 +3,6 @@
 //////////////////////////////////////////////////////////////////////
 #pragma once
 
-#include <Afxtempl.h>
-
 #include <map>
 #include <string>
 #include <vector>
diff --git a/commdll/Include/VisionUnitResult.h b/commdll/Include/VisionUnitResult.h
index 53ffba3..9a79e2c 100644
--- a/commdll/Include/VisionUnitResult.h
+++ b/commdll/Include/VisionUnitResult.h
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "VisionResult.h"
-
 #include <array>
 #include <vector>
 #include <string>
 
+#include "VisionResult.h"
+
 #ifdef BUILD_COMMDLL
 #define COMMDLL_DLLCLASS __declspec(dllexport)
 #else
diff --git a/dll/commdllD.dll b/dll/commdllD.dll
index e80f88f..511be66 100644
Binary files a/dll/commdllD.dll and b/dll/commdllD.dll differ
diff --git a/dll/iodllD.dll b/dll/iodllD.dll
index a5c69bd..0b53a0f 100644
Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ
diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll
index 9292ce4..1a01f33 100644
Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ
diff --git a/dll/secsgemdllD.dll b/dll/secsgemdllD.dll
index 0bfc5fa..5ef9d04 100644
Binary files a/dll/secsgemdllD.dll and b/dll/secsgemdllD.dll differ
diff --git a/dll/utilityD.dll b/dll/utilityD.dll
index a6f2044..388226b 100644
Binary files a/dll/utilityD.dll and b/dll/utilityD.dll differ
diff --git a/iodll/Include/HardwareIni.h b/iodll/Include/HardwareIni.h
index ca69462..5786de7 100644
--- a/iodll/Include/HardwareIni.h
+++ b/iodll/Include/HardwareIni.h
@@ -7,8 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "Afxtempl.h"
-
 #include "gclib.h"
 #include "gclibo.h"
 // ETEL
diff --git a/mcctrdll/lib/mcctrdllD.lib b/mcctrdll/lib/mcctrdllD.lib
index 576908e..8d4ea94 100644
Binary files a/mcctrdll/lib/mcctrdllD.lib and b/mcctrdll/lib/mcctrdllD.lib differ
diff --git a/secsgemdll/Include/pch.h b/secsgemdll/Include/pch.h
index 2357d64..47db5c4 100644
--- a/secsgemdll/Include/pch.h
+++ b/secsgemdll/Include/pch.h
@@ -10,6 +10,6 @@
 // add headers that you want to pre-compile here
 #include "framework.h"
 
-#include <fmt/core.h>
+#include "fmt/core.h"
 #include "Utility.h"
 #endif //PCH_H
diff --git a/utility/Include/DebugLog.h b/utility/Include/DebugLog.h
index 9c2080d..3e21a56 100644
--- a/utility/Include/DebugLog.h
+++ b/utility/Include/DebugLog.h
@@ -70,7 +70,7 @@ void DebugLogTimingTrace(bool bTraceData, fmt::format_string<Args...> _fmt, Args
 {
     if (bTraceData)
     {
-        mitechlogManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
+        logManager.GetLogger(eLOGGER::DEBUG_TIMING_LOG).Log(_fmt, args...);
     }
 }
 
diff --git a/utility/Include/Trigger.h b/utility/Include/Trigger.h
index e1536a5..b5fbf98 100644
--- a/utility/Include/Trigger.h
+++ b/utility/Include/Trigger.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <afxtempl.h>
+#include <vector>
 
 #include "MyWait.h"
 #include "Evt.h"
@@ -20,8 +20,7 @@ public:
     void Reset();
 
 protected:
-    DWORD m_dwCount;
-    CTypedPtrArray<CPtrArray, HANDLE> m_aHandle;
+    std::vector<HANDLE> m_aHandle;
 
 private:
     DWORD WaitFor(DWORD dwTimeOut, BOOL bWaitForAll);
diff --git a/utility/lib/utilityD.lib b/utility/lib/utilityD.lib
index 2b65bac..de87413 100644
Binary files a/utility/lib/utilityD.lib and b/utility/lib/utilityD.lib differ