diff --git a/MultiTool.Form/frmImportMain.vb b/MultiTool.Form/frmImportMain.vb
index 14505b4..1f094b1 100644
--- a/MultiTool.Form/frmImportMain.vb
+++ b/MultiTool.Form/frmImportMain.vb
@@ -57,14 +57,15 @@ Public Class frmImportMain
         Try
             txtVersion.Caption = String.Format(txtVersion.Caption, Application.ProductVersion)
 
-            LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "EDI Document Importer")
+            LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, Application.CompanyName, Application.ProductName)
             Logger = LogConfig.GetLogger()
-            Logger.Info("EDI Document Importer, Version [{0}]", Application.ProductVersion)
+            Logger.Info("Starting {0}, Version [{1}]", Application.ProductName, Application.ProductVersion)
 
             ConfigManager = New ConfigManager(Of Config)(LogConfig,
-            Application.UserAppDataPath,
-            Application.CommonAppDataPath,
-            Application.StartupPath)
+                Application.UserAppDataPath,
+                Application.CommonAppDataPath,
+                Application.StartupPath
+            )
 
             Message = New Message(LogConfig)
 
@@ -90,7 +91,7 @@ Public Class frmImportMain
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
             Winline = New Data(LogConfig, Database, ConfigManager.Config)
-            WebService = New WebService(LogConfig, ConfigManager.Config)
+            WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
             PositionData = New PositionData(LogConfig, Winline)
         Catch ex As Exception
             ShowError(ex, "Initialisieren der Anwendungs Daten")
@@ -370,7 +371,8 @@ Public Class frmImportMain
     End Sub
 
     Private Sub btnOpenOutputDirectory_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnOpenOutputDirectory.ItemClick
-        Dim oOutputDirectory = IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService")
+        Dim oOutputDirectory = Path.Combine(Application.UserAppDataPath, "WebService")
+        'Dim oOutputDirectory = IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService")
         TryOpenDirectory(oOutputDirectory, "Ausgabeverzeichnis")
     End Sub
 
diff --git a/MultiTool.Form/frmImportMain_old.vb b/MultiTool.Form/frmImportMain_old.vb
index e642bdc..104bc90 100644
--- a/MultiTool.Form/frmImportMain_old.vb
+++ b/MultiTool.Form/frmImportMain_old.vb
@@ -53,7 +53,7 @@ Public Class frmImportMain_old
             Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
             Database = New MSSQLServer(LogConfig, oConnectionString)
             Winline = New Data(LogConfig, Database, ConfigManager.Config)
-            WebService = New WebService(LogConfig, ConfigManager.Config)
+            WebService = New WebService(LogConfig, ConfigManager.Config, Application.UserAppDataPath)
             PositionData = New PositionData(LogConfig, Winline)
 
             ' Load WinLine Data
diff --git a/MultiTool.Shared/Winline/Data.vb b/MultiTool.Shared/Winline/Data.vb
index a634ff8..1377d45 100644
--- a/MultiTool.Shared/Winline/Data.vb
+++ b/MultiTool.Shared/Winline/Data.vb
@@ -157,6 +157,7 @@ Namespace Winline
 
             For Each oMandator As Mandator In pMandators
                 Try
+                    '  TODO: This is Schaum specific, maybe move to config later
                     Dim oSQL = $"
                         SELECT 
                         [c030],
@@ -171,7 +172,7 @@ Namespace Winline
                     Dim oTable As DataTable = Database.GetDatatable(oSQL)
 
                     If oTable.Rows.Count = 0 Then
-                        Logger.Warn("No DocumentKinds found for Mandator [{0}]", oMandator.Id)
+                        Logger.Debug("No DocumentKinds found for Mandator [{0}]", oMandator.Id)
                         Continue For
                     End If
 
diff --git a/MultiTool.Shared/Winline/WebService.vb b/MultiTool.Shared/Winline/WebService.vb
index a1e9521..670a8cc 100644
--- a/MultiTool.Shared/Winline/WebService.vb
+++ b/MultiTool.Shared/Winline/WebService.vb
@@ -16,12 +16,14 @@ Namespace Winline
         Private ReadOnly Serializer As Serializer
         Private ReadOnly Mapper As AutoMapper.Mapper
         Private ReadOnly FileEx As File
+        Private ReadOnly AppDataPath As String
 
-        Public Sub New(pLogConfig As LogConfig, pConfig As Config)
+        Public Sub New(pLogConfig As LogConfig, pConfig As Config, pAppDataPath As String)
             MyBase.New(pLogConfig, pLogConfig.GetLogger())
             FileEx = New File(pLogConfig)
             Serializer = New Serializer(pLogConfig)
             Config = pConfig
+            AppDataPath = pAppDataPath
             'Mapper = MapperFactory.GetMapper()
         End Sub
 
@@ -226,7 +228,7 @@ Namespace Winline
         'End Function
 
         Private Function GetBaseWebServicePath() As String
-            Return IO.Path.Combine(FileEx.GetAppDataPath("Digital Data", "EDI Document Importer"), "WebService")
+            Return IO.Path.Combine(AppDataPath, "WebService")
         End Function
 
         Private Function GetBaseFilenameForRequest() As String