diff --git a/EDMI_ClientSuite/ApplicationEvents.vb b/EDMI_ClientSuite/ApplicationEvents.vb
index 4bd9c660..c581efb4 100644
--- a/EDMI_ClientSuite/ApplicationEvents.vb
+++ b/EDMI_ClientSuite/ApplicationEvents.vb
@@ -25,7 +25,7 @@ Namespace My
 
             ' Layout files will be saved in %Appdata% (Roaming) so they will be syncronized with the user profile
             Dim oUIConfigPath = IO.Path.Combine(Windows.Forms.Application.UserAppDataPath, ClassConstants.FOLDER_NAME_LAYOUT)
-            Dim oUIConfigManager As New ConfigManager(Of ClassUIConfig)(oLogConfig, oUIConfigPath)
+            Dim oUIConfigManager As New ConfigManager(Of ClassUIConfig)(oLogConfig, oUIConfigPath, oUIConfigPath)
 
             LogConfig = oLogConfig
             SystemConfigManager = oSystemConfigManager
diff --git a/EDMI_ClientSuite/ClassConfig.vb b/EDMI_ClientSuite/ClassConfig.vb
index bbf69a37..1c6f2137 100644
--- a/EDMI_ClientSuite/ClassConfig.vb
+++ b/EDMI_ClientSuite/ClassConfig.vb
@@ -1,6 +1,5 @@
-Imports System.ComponentModel
-Imports System.Runtime.CompilerServices
-Imports System.Xml.Serialization
+Imports System.Xml.Serialization
+Imports DigitalData.Modules.Config.ConfigAttributes
 
 ''' <summary>
 ''' --- User Config for EDMI ---
@@ -37,7 +36,9 @@ Public Class ClassConfig
 
     ' === Simple/Actual Config Properties ===
     ' === Service Configuration ===
+    <ConnectionString>
     Public Property ServiceIP As String = String.Empty
+    <ConnectionString>
     Public Property ServicePort As Integer = -1
     Public Property HeartbeatInterval As Integer = 5000
 
diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj
index 0009c873..44f11aec 100644
--- a/EDMI_ClientSuite/ClientSuite.vbproj
+++ b/EDMI_ClientSuite/ClientSuite.vbproj
@@ -446,7 +446,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Config\Config.vbproj">
-      <Project>{44982F9B-6116-44E2-85D0-F39650B1EF99}</Project>
+      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>
     </ProjectReference>
     <ProjectReference Include="..\EDMI_FILE_OPs\EDMIAPI.vbproj">