diff --git a/commdll/lib/commdll.lib b/commdll/lib/commdll.lib
index 5458453..58cad02 100644
Binary files a/commdll/lib/commdll.lib and b/commdll/lib/commdll.lib differ
diff --git a/commdll/lib/commdllD.lib b/commdll/lib/commdllD.lib
index c58575e..7b683d3 100644
Binary files a/commdll/lib/commdllD.lib and b/commdll/lib/commdllD.lib differ
diff --git a/dll/commdll.dll b/dll/commdll.dll
index ff3bc39..aa520aa 100644
Binary files a/dll/commdll.dll and b/dll/commdll.dll differ
diff --git a/dll/commdllD.dll b/dll/commdllD.dll
index 1b3b2e6..1f39abd 100644
Binary files a/dll/commdllD.dll and b/dll/commdllD.dll differ
diff --git a/dll/iodll.dll b/dll/iodll.dll
index b93e2b5..7c0462b 100644
Binary files a/dll/iodll.dll and b/dll/iodll.dll differ
diff --git a/dll/iodllD.dll b/dll/iodllD.dll
index 9e52efa..712baf9 100644
Binary files a/dll/iodllD.dll and b/dll/iodllD.dll differ
diff --git a/dll/mcctrdllD.dll b/dll/mcctrdllD.dll
index 54c0cc9..7f78e4f 100644
Binary files a/dll/mcctrdllD.dll and b/dll/mcctrdllD.dll differ
diff --git a/dll/secsgemdllD.dll b/dll/secsgemdllD.dll
index 4000da3..8ead453 100644
Binary files a/dll/secsgemdllD.dll and b/dll/secsgemdllD.dll differ
diff --git a/dll/utility.dll b/dll/utility.dll
index 7c8d2c5..1338123 100644
Binary files a/dll/utility.dll and b/dll/utility.dll differ
diff --git a/dll/utilityD.dll b/dll/utilityD.dll
index d9baff7..f1ee670 100644
Binary files a/dll/utilityD.dll and b/dll/utilityD.dll differ
diff --git a/iodll/lib/iodll.lib b/iodll/lib/iodll.lib
index ef7a95e..76ccedb 100644
Binary files a/iodll/lib/iodll.lib and b/iodll/lib/iodll.lib differ
diff --git a/iodll/lib/iodllD.lib b/iodll/lib/iodllD.lib
index 5564b84..4057142 100644
Binary files a/iodll/lib/iodllD.lib and b/iodll/lib/iodllD.lib differ
diff --git a/mcctrdll/Include/ModuleRS.h b/mcctrdll/Include/ModuleRS.h
new file mode 100644
index 0000000..c4c4580
--- /dev/null
+++ b/mcctrdll/Include/ModuleRS.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <vector>
+#include "DllDefines.h"
+
+#include <ado2.h>
+#include <structure.h>
+
+class MCCTRDLLCLASS CModuleRS
+{
+public:
+    // Field/Param Data
+    long m_ID{ 0 };
+    std::string m_Module_Name{ "" };
+
+public:
+    ~CModuleRS();
+
+    std::string GetDefaultDBName(); // Default database name
+    std::string GetDefaultSQL();    // Default SQL for Recordset
+
+
+    //  Close Recordset and close database
+    void Close();
+
+    int InitModule(std::vector<stModule>& modules);
+
+private:
+    bool Open(std::string sqlQuery);
+    void GetAllFieldsValue();
+
+    CADODatabase m_db;
+    CADORecordset m_rs;
+};
diff --git a/mcctrdll/Include/MotorRS.h b/mcctrdll/Include/MotorRS.h
index c20bc91..ed1c3fa 100644
--- a/mcctrdll/Include/MotorRS.h
+++ b/mcctrdll/Include/MotorRS.h
@@ -52,21 +52,22 @@ public:
 
     void InitMotorModule(std::vector<stModule>& modules); // Function to init motor module to maintenance page
 
+    //  get Save all pkg
+    BOOL GetSaveAllPkg(std::string csPosName);
+
+    int GetNoOfMtrs(std::vector<stModule>& modules);
+
+    //  set the motor position name from Motor and MotorSubField table
+    [[deprecated("For Legacy GUI use case")]] 
+    void SetMtrPosName(std::vector<stModule>& modules);
     //  get motor and pos name
+    [[deprecated("For Legacy GUI use case")]] 
     bool GetMtrAndPosName(std::vector<stModule>& modules, int iMtrNo, int iMtrPos, std::string& csMtrName, std::string& csMtrPos);
-
     //  get motor pos name
+    [[deprecated("For Legacy GUI use case")]] 
     int GetMtrPosNo(std::vector<stModule>& module, std::string csModuleName, int iMtrNo, std::string csMtrPos,
         std::string csSubPosName);
 
-    //  get Save all pkg
-    BOOL GetSaveAllPkg(std::string csPosName);
-    int InitModule(std::vector<stModule>& module);
-    //  set the motor position name from Motor and MotorSubField table
-    void SetMtrPosName(std::vector<stModule>& modules);
-
-    int GetNoOfMtrs(std::vector<stModule>& modules);
-
 private:
     CADODatabase m_db;
     CADORecordset m_rs;
diff --git a/mcctrdll/Include/MtrProfileRS.h b/mcctrdll/Include/MtrProfileRS.h
index 780cb52..05679d2 100644
--- a/mcctrdll/Include/MtrProfileRS.h
+++ b/mcctrdll/Include/MtrProfileRS.h
@@ -10,7 +10,9 @@
 #include "structure.h"
 #include "ado2.h"
 
-class CMtrProfileRS
+#include "DllDefines.h"
+
+class MCCTRDLLCLASS CMtrProfileRS
 {
 public:
     CMtrProfileRS();
diff --git a/mcctrdll/lib/mcctrdllD.lib b/mcctrdll/lib/mcctrdllD.lib
index e4104b1..61682f0 100644
Binary files a/mcctrdll/lib/mcctrdllD.lib and b/mcctrdll/lib/mcctrdllD.lib differ
diff --git a/secsgemdll/lib/secsgemdllD.lib b/secsgemdll/lib/secsgemdllD.lib
index 7a956c2..a534756 100644
Binary files a/secsgemdll/lib/secsgemdllD.lib and b/secsgemdll/lib/secsgemdllD.lib differ
diff --git a/utility/lib/utility.lib b/utility/lib/utility.lib
index 773bfa2..acdb2ef 100644
Binary files a/utility/lib/utility.lib and b/utility/lib/utility.lib differ
diff --git a/utility/lib/utilityD.lib b/utility/lib/utilityD.lib
index b645b8d..bedd384 100644
Binary files a/utility/lib/utilityD.lib and b/utility/lib/utilityD.lib differ