EDMI: fix API.Client constructor

Version 2.0.1.0
Logging: Show Method/Line Numbers for Debug Messages
2020-04-28 14:51:24 +02:00 · 2020-04-28 14:50:55 +02:00 · 2020-04-28 14:50:41 +02:00 · 2020-04-28 11:11:54 +02:00 · 2020-04-27 16:22:34 +02:00 · 2020-04-27 14:17:12 +02:00
199 changed files with 4580 additions and 2198 deletions
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -7,6 +7,7 @@ Imports DevExpress.Spreadsheet
 Imports GdPicture14
 Imports DevExpress
 Imports DevExpress.Office.Utils
+Imports System.IO

 Public Class DocumentViewer
    Private Enum ZoomMode
@@ -83,9 +84,6 @@ Public Class DocumentViewer
            Exit Sub
        End If

-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-
        _logger.Info("Loading File {0}", FilePath)

        DoLoadFile(FilePath)
@@ -93,6 +91,21 @@ Public Class DocumentViewer
        UpdateMainUi()
    End Sub

+    Public Sub LoadFile(FileName As String, Stream As Stream)
+        If _licenseKey = String.Empty Then
+            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
+            Exit Sub
+        End If
+
+        Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
+
+        _logger.Info("Loading File [{0}]", FileName)
+
+        DoLoadFile(Stream, oExtension)
+
+        UpdateMainUi()
+    End Sub
+
    Public Sub CloseDocument()
        GdViewer.CloseDocument()
        UpdateMainUi()
@@ -139,32 +152,13 @@ Public Class DocumentViewer
                    RichEditControl1.Dock = DockStyle.Fill

                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
-
-                    Select Case oExtension.ToUpper
-                        Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
-                        Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
-                        Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
-                        Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
-                        Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
-                        Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
-                    End Select
-
-                    RichEditControl1.LoadDocument(FilePath, oFormat)
+                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))

                    RichEditControl1.Visible = True
                    RichEditControl1.Dock = DockStyle.Fill

                Case ".XLSX", ".XLS", "CSV"
-                    Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
-
-                    Select Case oExtension.ToUpper
-                        Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
-                        Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
-                        Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
-                    End Select
-
-                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+                    SpreadsheetControl1.LoadDocument(FilePath, GetSpreadsheetFormat(oExtension))

                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
                    oRange.AutoFitColumns()
@@ -175,13 +169,103 @@ Public Class DocumentViewer
                Case Else
                    mainToolStrip.Visible = True

+                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+
                    GdViewer.DisplayFromFile(FilePath)
            End Select
+
+            UpdateMainUi()
        Catch ex As Exception
            _logger.Error(ex)
        End Try
    End Sub

+    Private Sub DoLoadFile(Stream As Stream, Extension As String)
+        Try
+            RichEditControl1.Visible = False
+            RichEditControl1.Dock = DockStyle.None
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            mainToolStrip.Visible = False
+
+            Select Case Extension.ToUpper
+                Case ".MSG"
+                    Dim oMsg As New Message(Stream)
+
+                    ' TODO: Improve Encoding, maybe convert based on encoding
+                    oMsg.Encoding = System.Text.Encoding.UTF32
+                    Dim oMime = oMsg.ConvertToMimeMessage()
+                    Dim oTempFileName = IO.Path.GetTempFileName()
+                    oMime.Save(oTempFileName, True)
+
+                    RichEditControl1.LoadDocument(oTempFileName, XtraRichEdit.DocumentFormat.Mht)
+
+                    _TempFiles.Add(oTempFileName)
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", "CSV"
+                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    mainToolStrip.Visible = True
+
+                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+
+                    GdViewer.DisplayFromStream(Stream)
+            End Select
+
+            UpdateMainUi()
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    Private Function GetSpreadsheetFormat(Extension) As Spreadsheet.DocumentFormat
+        Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
+
+        Select Case Extension.ToUpper
+            Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
+            Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
+            Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
+        End Select
+
+        Return oFormat
+    End Function
+
+    Private Function GetDocumentFormat(Extension)
+        Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
+
+        Select Case Extension.ToUpper
+            Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
+            Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
+            Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
+            Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
+            Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
+            Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
+        End Select
+
+        Return oFormat
+    End Function
+
+
    Private Sub btnOpen_Click(sender As Object, e As EventArgs)
        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
--- a/Controls.DocumentViewer/My
+++ b/Controls.DocumentViewer/My
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.0.2.0")>
+<Assembly: AssemblyVersion("1.0.3.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/DDMonorepo.sln
+++ b/DDMonorepo.sln
@@ -40,22 +40,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Licenses", "Licenses", "{59
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging.Test", "Modules.Logging.Test\Logging.Test.vbproj", "{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDZUGFeRDService", "DDZUGFeRDService\DDZUGFeRDService.vbproj", "{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Interfaces", "Modules.Interfaces\Interfaces.vbproj", "{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ZUGFeRDTest", "GUIs.Test.ZUGFeRDTest\ZUGFeRDTest.vbproj", "{16156434-E471-43F1-8030-76A0DA17CD5A}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "DD_CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUI_EDMI", "GUIs.Test.GUI_EDMI\GUI_EDMI.vbproj", "{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClientSuite", "GUIs.ClientSuite\ClientSuite.vbproj", "{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IDBService", "SERVICES\DDEDM_NetworkService\IDBService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}"
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "DDLicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "License", "Modules.License\License.vbproj", "{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ADSyncTest", "GUIs.Test.ADSyncTest\ADSyncTest.vbproj", "{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E}"
@@ -92,8 +84,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ClipboardWatcher", "GUIs.Cl
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem", "Modules.Filesystem\Filesystem.vbproj", "{991D0231-4623-496D-8BD0-9CA906029CBC}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIAPI", "Modules.EDMIAPI\EDMIAPI.vbproj", "{5B1171DC-FFFE-4813-A20D-786AAE47B320}"
-EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Jobs", "Modules.Jobs\Jobs.vbproj", "{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Filesystem.Test", "Modules\Filesystem.Test\Filesystem.Test.vbproj", "{B29ED6D4-839B-413A-A485-B10F4A4788EA}"
@@ -102,11 +92,27 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.GraphQLTest", "GU
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.DocumentViewerTest", "GUIs.Test.DocumentViewerTest\GUIs.Test.DocumentViewerTest.vbproj", "{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "DDEmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebServices", "WebServices", "{D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZUGFeRDRESTService", "WEBSERVICES\ZUGFeRDRESTService\ZUGFeRDRESTService.csproj", "{FD50590A-59C1-4798-AD90-419A588DCE76}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File", "EDMI.File\EDMI.File.vbproj", "{1477032D-7A02-4C5F-B026-A7117DA4BC6B}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "Modules.EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.File.Test", "EDMI.File.Test\EDMI.File.Test.vbproj", "{16857A4E-2609-47E6-9C35-7669D64DD040}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMIService", "Service.EDMIService\EDMIService.vbproj", "{A8C3F298-76AB-4359-AB3C-986E313B4336}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEmailService", "Services.EmailService\DDEmailService.vbproj", "{83ED2617-B398-4859-8F59-B38F8807E83E}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_CommunicationService", "Services.CommunicationService\DD_CommunicationService.vbproj", "{1FB2854F-C050-427D-9FAC-1D8F232E8025}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDZUGFeRDService", "Services.ZUGFeRDService\DDZUGFeRDService.vbproj", "{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DDEDMLicenseService", "Services.LicenseService\DDEDMLicenseService.vbproj", "{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}"
+EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "GUIs.Test.EDMIBenchmark", "GUIs.Test.EDMIBenchmark\GUIs.Test.EDMIBenchmark.vbproj", "{5FDEC007-7AE0-4829-B1AE-6165E29375DA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -150,10 +156,6 @@ Global
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -162,10 +164,6 @@ Global
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16156434-E471-43F1-8030-76A0DA17CD5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.Build.0 = Release|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -174,14 +172,6 @@ Global
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -250,10 +240,6 @@ Global
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{991D0231-4623-496D-8BD0-9CA906029CBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B1171DC-FFFE-4813-A20D-786AAE47B320}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -270,14 +256,46 @@ Global
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD50590A-59C1-4798-AD90-419A588DCE76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1477032D-7A02-4C5F-B026-A7117DA4BC6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16857A4E-2609-47E6-9C35-7669D64DD040}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8C3F298-76AB-4359-AB3C-986E313B4336}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83ED2617-B398-4859-8F59-B38F8807E83E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FDEC007-7AE0-4829-B1AE-6165E29375DA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -292,14 +310,10 @@ Global
 		{44982F9B-6116-44E2-85D0-F39650B1EF99} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{3DCD6D1A-C830-4241-B7E4-27430E7EA483} = {F98C0329-C004-417F-B2AB-7466E88D8220}
 		{3207D8E7-36E3-4714-9B03-7B5B3D6D351A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
-		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{AB6F09BF-E794-4F6A-94BB-C97C0BA84D64} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{16156434-E471-43F1-8030-76A0DA17CD5A} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
-		{1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{88EDAD5B-1B98-43E4-B068-1251E7AF01A0} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{406C95F4-9FEA-45B6-8385-1768CDBBF1A7} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
-		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
-		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{5EBACBFA-F11A-4BBF-8D02-91461F2293ED} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{7386AB04-DF8D-4DFB-809D-1FAC8212CB7E} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{926E6474-5613-4373-BB99-B101158B91EF} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
@@ -317,13 +331,20 @@ Global
 		{AF664D85-0A4B-4BAB-A2F8-83110C06553A} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E} = {8FFE925E-8B84-45F1-93CB-32B1C96F41EB}
 		{991D0231-4623-496D-8BD0-9CA906029CBC} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
-		{5B1171DC-FFFE-4813-A20D-786AAE47B320} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{39EC839A-3C30-4922-A41E-6B09D1DDE5C3} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{B29ED6D4-839B-413A-A485-B10F4A4788EA} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
 		{609B09B4-AD1E-40F7-8899-A6685924621C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 		{F9CCEFCD-21B3-4319-9DB1-A0756DA5BA1C} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
-		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
 		{FD50590A-59C1-4798-AD90-419A588DCE76} = {D3BAE68E-406E-493D-A4E5-DB6EDDFFB371}
+		{1477032D-7A02-4C5F-B026-A7117DA4BC6B} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{25017513-0D97-49D3-98D7-BA76D9B251B0} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{16857A4E-2609-47E6-9C35-7669D64DD040} = {3E2008C8-27B1-41DD-9B1A-0C4029F6AECC}
+		{A8C3F298-76AB-4359-AB3C-986E313B4336} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{83ED2617-B398-4859-8F59-B38F8807E83E} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{1FB2854F-C050-427D-9FAC-1D8F232E8025} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{7DEEC36E-EA5F-4711-AD1E-FD8894F4AD77} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{CBE9322E-67A1-4CC5-B25F-4A1B4C9FC55C} = {7AF3F9C2-C939-4A08-95C1-0453207E298A}
+		{5FDEC007-7AE0-4829-B1AE-6165E29375DA} = {CC368D6A-6AC4-4EB9-A092-14700FABEF7A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1BE4090-A0FD-48AF-86CB-39099D14B286}
--- a/SERVICES/DDEDM_NetworkService/IDBService.vbproj
+++ b/SERVICES/DDEDM_NetworkService/IDBService.vbproj
@@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{A8C3F298-76AB-4359-AB3C-986E313B4336}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <StartupObject>DigitalData.Services.IDBService.WindowsService</StartupObject>
-    <RootNamespace>DigitalData.Services.IDBService</RootNamespace>
-    <AssemblyName>IDBService</AssemblyName>
+    <ProjectGuid>{16857A4E-2609-47E6-9C35-7669D64DD040}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>EDMI.File.Test</RootNamespace>
+    <AssemblyName>EDMI.File.Test</AssemblyName>
    <FileAlignment>512</FileAlignment>
-    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <MyType>Windows</MyType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <DefineDebug>true</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>IDBService.xml</DocumentationFile>
+    <DocumentationFile>EDMI.File.Test.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
    <DebugType>pdbonly</DebugType>
    <DefineDebug>false</DefineDebug>
    <DefineTrace>true</DefineTrace>
    <Optimize>true</Optimize>
    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>IDBService.xml</DocumentationFile>
+    <DocumentationFile>EDMI.File.Test.xml</DocumentationFile>
    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
  </PropertyGroup>
  <PropertyGroup>
@@ -47,29 +52,18 @@
    <OptionInfer>On</OptionInfer>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=6.4.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.Install" />
    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Transactions" />
-    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
  </ItemGroup>
  <ItemGroup>
    <Import Include="Microsoft.VisualBasic" />
@@ -81,21 +75,10 @@
    <Import Include="System.Linq" />
    <Import Include="System.Xml.Linq" />
    <Import Include="System.Threading.Tasks" />
+    <Import Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="AppConfig.vb" />
-    <Compile Include="Results\BaseResult.vb" />
-    <Compile Include="Results\ContainerResult.vb" />
-    <Compile Include="Results\DocumentResult.vb" />
-    <Compile Include="Exceptions.vb" />
-    <Compile Include="Results\DatabaseResult.vb" />
-    <Compile Include="IDBService.vb" />
-    <Compile Include="Results\DocumentResult2.vb" />
-    <Compile Include="Results\IndexResult.vb" />
-    <Compile Include="WindowsService.vb">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="IIDBService.vb" />
+    <Compile Include="PathTest.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -111,11 +94,6 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
-    <Compile Include="ProjectInstaller.vb">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="Request.vb" />
-    <Compile Include="SettingsModule.vb" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\Resources.resx">
@@ -124,9 +102,6 @@
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
    </EmbeddedResource>
-    <EmbeddedResource Include="ProjectInstaller.resx">
-      <DependentUpon>ProjectInstaller.vb</DependentUpon>
-    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
    <None Include="My Project\Application.myapp">
@@ -138,29 +113,26 @@
      <CustomToolNamespace>My</CustomToolNamespace>
      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
    </None>
-    <None Include="App.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <SubType>Designer</SubType>
-    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Modules.Database\Database.vbproj">
-      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
-      <Name>Database</Name>
+    <ProjectReference Include="..\EDMI.File\EDMI.File.vbproj">
+      <Project>{1477032d-7a02-4c5f-b026-a7117da4bc6b}</Project>
+      <Name>EDMI.File</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.EDMIAPI\EDMIAPI.vbproj">
-      <Project>{5B1171DC-FFFE-4813-A20D-786AAE47B320}</Project>
-      <Name>EDMIAPI</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Filesystem\Filesystem.vbproj">
-      <Project>{991D0231-4623-496D-8BD0-9CA906029CBC}</Project>
-      <Name>Filesystem</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Logging\Logging.vbproj">
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
  </ItemGroup>
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -0,0 +1,18 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+<Assembly: AssemblyTitle("EDMI.File.Test")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("EDMI.File.Test")>
+<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyTrademark("")>
+
+<Assembly: ComVisible(False)>
+
+<Assembly: Guid("a6f8dbf8-5ba9-478d-a230-1aca3ed6379c")>
+
+' <Assembly: AssemblyVersion("1.0.*")> 
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My.Resources
+
+    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'class via a tool like ResGen or Visual Studio.
+    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'with the /str option, or rebuild your VS project.
+    '''<summary>
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+    Friend Module Resources
+
+        Private resourceMan As Global.System.Resources.ResourceManager
+
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+
+        '''<summary>
+        '''  Returns the cached ResourceManager instance used by this class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EDMI.File.Test.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+
+        '''<summary>
+        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  resource lookups using this strongly typed resource class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set(ByVal value As Global.System.Globalization.CultureInfo)
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0"), _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
+
+#Region "My.Settings Auto-Save Functionality"
+#If _MyType = "WindowsForms" Then
+        Private Shared addedHandler As Boolean
+
+        Private Shared addedHandlerLockObject As New Object
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+            If My.Application.SaveMySettingsOnExit Then
+                My.Settings.Save()
+            End If
+        End Sub
+#End If
+#End Region
+
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+
+#If _MyType = "WindowsForms" Then
+                   If Not addedHandler Then
+                        SyncLock addedHandlerLockObject
+                            If Not addedHandler Then
+                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                                addedHandler = True
+                            End If
+                        End SyncLock
+                    End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
+    Friend Module MySettingsProperty
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
+        Friend ReadOnly Property Settings() As Global.EDMI.File.Test.My.MySettings
+            Get
+                Return Global.EDMI.File.Test.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
--- a/EDMI.File.Test/PathTest.vb
+++ b/EDMI.File.Test/PathTest.vb
@@ -0,0 +1,22 @@
+Imports System.Text
+Imports DigitalData.Modules.Logging
+Imports Microsoft.VisualStudio.TestTools.UnitTesting
+Imports DigitalData.Modules.EDMI
+
+<TestClass()> Public Class PathTest
+
+    '<TestMethod()> Public Sub TestMethod1()
+    '    Dim oLogConfig As New LogConfig(LogConfig.PathType.Temp)
+    '    Dim oTempPath = System.IO.Path.GetTempPath()
+    '    Dim oPath As New DigitalData.Modules.EDMI.File.Path(oLogConfig, oTempPath)
+    '    Dim oNow As DateTime = DateTime.Now
+    '    Dim oYear = oNow.Year
+    '    Dim oMonth = oNow.Month.ToString.PadLeft(2, "0")
+    '    Dim oDay = oNow.Day.ToString.PadLeft(2, "0")
+
+
+    '    Assert.AreEqual(oPath.GetFullPath("TestDocumentType"), $"{oTempPath}EDMI\Active\TestDocumentType\{oYear}\{oMonth}\{oDay}")
+    '    Assert.AreEqual(oPath.GetArchivePath("TestDocumentType"), $"{oTempPath}EDMI\Archive\TestDocumentType\{oYear}\{oMonth}\{oDay}")
+    'End Sub
+
+End Class
--- a/EDMI.File.Test/packages.config
+++ b/EDMI.File.Test/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net472" />
+</packages>
--- a/EDMI.File/Archive.vb
+++ b/EDMI.File/Archive.vb
@@ -1,11 +1,39 @@
-Imports DigitalData.Modules.Logging
+Imports System.IO
+Imports DigitalData.Modules.Logging

 Public Class Archive
-    Private _LogConfig As LogConfig
-    Private _Logger As Logger
+    Private ReadOnly _LogConfig As LogConfig
+    Private ReadOnly _Logger As Logger

    Public Sub New(LogConfig As LogConfig)
        _LogConfig = LogConfig
        _Logger = LogConfig.GetLogger()
    End Sub
+
+    ''' <summary>
+    ''' Sets a retention-period for a give file path by setting the file attributes LastAccessTime and ReadOnly
+    ''' </summary>
+    ''' <param name="FilePath"></param>
+    ''' <param name="RetentionTimeInDays">If greater than 0, sets this plus the current date as LastAccessTime</param>
+    ''' <param name="[ReadOnly]">If true, sets ReadOnly Attribute</param>
+    Public Sub SetRetention(FilePath As String, RetentionTimeInDays As Integer, [ReadOnly] As Boolean)
+        Try
+            If RetentionTimeInDays > 0 Then
+                _Logger.Info("Setting LastAccessTime for file [{0}]", FilePath)
+                IO.File.SetLastAccessTime(FilePath, Date.Now.AddDays(RetentionTimeInDays))
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+
+        Try
+            If [ReadOnly] Then
+                _Logger.Info("Setting ReadOnly Attribute for file [{0}]", FilePath)
+                Dim oAttributes = IO.File.GetAttributes(FilePath) Or FileAttributes.ReadOnly
+                IO.File.SetAttributes(FilePath, oAttributes)
+            End If
+        Catch ex As Exception
+            _Logger.Error(ex)
+        End Try
+    End Sub
 End Class
--- a/EDMI.File/EDMI.File.vbproj
+++ b/EDMI.File/EDMI.File.vbproj
@@ -89,6 +89,7 @@
      <DependentUpon>Settings.settings</DependentUpon>
      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    </Compile>
+    <Compile Include="Path.vb" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="My Project\Resources.resx">
--- a/EDMI.File/Path.vb
+++ b/EDMI.File/Path.vb
@@ -0,0 +1,50 @@
+Imports DigitalData.Modules.Logging
+Imports System.IO
+
+Public Class Path
+    Private ReadOnly _LogConfig As LogConfig
+    Private ReadOnly _Logger As Logger
+    Private ReadOnly _BasePath As String
+
+    Public Sub New(LogConfig As LogConfig, DatastoreBasePath As String)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+        _BasePath = DatastoreBasePath
+    End Sub
+
+    Public Function GetFullPath(DocumentType As String, Optional FileName As String = "") As String
+        Dim oParts = New List(Of String) From {_BasePath}
+        oParts.AddRange(Do_GetRelativePath(DocumentType, FileName))
+
+        Return IO.Path.Combine(oParts.ToArray())
+    End Function
+
+    Public Function GetFullPathFromRelativePath(RelativePath As String) As String
+        Dim oParts = New List(Of String) From {_BasePath}
+        oParts.Add(RelativePath)
+        Return IO.Path.Combine(oParts.ToArray)
+    End Function
+
+    Public Function GetRelativePath(DocumentType As String, Optional FileName As String = "") As String
+        Return IO.Path.Combine(Do_GetRelativePath(DocumentType, FileName).ToArray)
+    End Function
+
+    Private Function Do_GetRelativePath(DocumentType As String, Optional FileName As String = "") As List(Of String)
+        Dim oPathParts As New List(Of String) From {DocumentType}
+        oPathParts.AddRange(GetDatePath())
+        oPathParts.Add(FileName)
+
+        Return oPathParts
+    End Function
+
+    Private Function GetDatePath() As List(Of String)
+        Dim oDate = DateTime.Now
+        Dim oResultList As New List(Of String) From {
+            oDate.Year,
+            oDate.Month.ToString.PadLeft(2, "0"),
+            oDate.Day.ToString.PadLeft(2, "0")
+        }
+
+        Return oResultList
+    End Function
+End Class
--- a/GUIs.ClientSuite/ClassService.vb
+++ b/GUIs.ClientSuite/ClassService.vb
@@ -1,8 +1,8 @@
 Imports System.ServiceModel
 Imports System.ServiceModel.Channels
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 Imports DigitalData.GUIs.ClientSuite.Base
 Imports System.ServiceModel.Security

@@ -73,15 +73,15 @@ Public Class ClassService
                                           End Function)
    End Function

-    Public Function GetChannelFactory() As IChannelFactory(Of IIDBServiceChannel)
+    Public Function GetChannelFactory() As IChannelFactory(Of IEDMIServiceChannel)
        Return GetChannelFactory(My.SysConfig.ServiceConnection)
    End Function

-    Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IIDBServiceChannel)
+    Public Function GetChannelFactory(EndpointURL As String) As ChannelFactory(Of IEDMIServiceChannel)
        Dim oBinding = GetBinding()
        Dim oEndpoint = New EndpointAddress(EndpointURL)

-        Dim oFactory As New ChannelFactory(Of IIDBServiceChannel)(oBinding, oEndpoint)
+        Dim oFactory As New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oEndpoint)
        Return oFactory
    End Function

--- a/GUIs.ClientSuite/ClientSuite.vbproj
+++ b/GUIs.ClientSuite/ClientSuite.vbproj
@@ -497,7 +497,7 @@
      <Name>Config</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
-      <Project>{5b1171dc-fffe-4813-a20d-786aae47b320}</Project>
+      <Project>{25017513-0d97-49d3-98d7-ba76d9b251b0}</Project>
      <Name>EDMI.API</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Language\Language.vbproj">
@@ -512,8 +512,8 @@
      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
      <Name>Logging</Name>
    </ProjectReference>
-    <ProjectReference Include="..\SERVICES\DDEDM_NetworkService\EDMIService.vbproj">
-      <Project>{A8C3F298-76AB-4359-AB3C-986E313B4336}</Project>
+    <ProjectReference Include="..\Service.EDMIService\EDMIService.vbproj">
+      <Project>{a8c3f298-76ab-4359-ab3c-986e313b4336}</Project>
      <Name>EDMIService</Name>
    </ProjectReference>
  </ItemGroup>
--- a/GUIs.ClientSuite/Common/ClassCommonCommands.vb
+++ b/GUIs.ClientSuite/Common/ClassCommonCommands.vb
@@ -1,5 +1,5 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference

 Public Class ClassCommonCommands
    Private _LogConfig As LogConfig
--- a/GUIs.ClientSuite/MyApplication.vb
+++ b/GUIs.ClientSuite/MyApplication.vb
@@ -2,7 +2,7 @@
 Imports System.Threading
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference

 Namespace My
    ''' <summary>
@@ -26,8 +26,8 @@ Namespace My
        End Property

        Property LogConfig As LogConfig
-        Property ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
-        Property Channel As IIDBServiceChannel
+        Property ChannelFactory As ChannelFactory(Of IEDMIServiceChannel)
+        Property Channel As IEDMIServiceChannel
        Property MainForm As frmMain
        Property Common As ClassCommon
    End Module
--- a/GUIs.ClientSuite/_TEST/frmFileTest.vb
+++ b/GUIs.ClientSuite/_TEST/frmFileTest.vb
@@ -1,6 +1,6 @@
 Imports System.IO
-Imports DigitalData.Modules.EDMIAPI
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMI.API

 Public Class frmFileTest
    Private _fileOp As Document
--- a/GUIs.ClientSuite/frmSplash.vb
+++ b/GUIs.ClientSuite/frmSplash.vb
@@ -2,12 +2,12 @@
 Imports System.ServiceModel
 Imports System.Threading
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference

 Public NotInheritable Class frmSplash
    Private _Worker As New BackgroundWorker()
-    Private _ChannelFactory As ChannelFactory(Of IIDBServiceChannel)
-    Private _Channel As IIDBServiceChannel
+    Private _ChannelFactory As ChannelFactory(Of IEDMIServiceChannel)
+    Private _Channel As IEDMIServiceChannel
    Private _Logger As Logger

    Private _CurrentRetry As Integer = 0
--- a/GUIs.Test.EDMIBenchmark/App.config
+++ b/GUIs.Test.EDMIBenchmark/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+</configuration>
--- a/GUIs.Test.EDMIBenchmark/Form1.Designer.vb
+++ b/GUIs.Test.EDMIBenchmark/Form1.Designer.vb
@@ -0,0 +1,535 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+Partial Class Form1
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()>
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()>
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1))
+        Dim DockingContainer1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer()
+        Me.DocumentGroup1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup(Me.components)
+        Me.Document1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document(Me.components)
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.ButtonSelectFiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.ButtonImportFiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.buttonClearLog = New DevExpress.XtraBars.BarButtonItem()
+        Me.buttonClearFiles = New DevExpress.XtraBars.BarButtonItem()
+        Me.TextboxObjectId = New DevExpress.XtraBars.BarEditItem()
+        Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
+        Me.ButtonLoadFile = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarListItem1 = New DevExpress.XtraBars.BarListItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem()
+        Me.BarDockingMenuItem1 = New DevExpress.XtraBars.BarDockingMenuItem()
+        Me.BarMdiChildrenListItem1 = New DevExpress.XtraBars.BarMdiChildrenListItem()
+        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.DocumentManager1 = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components)
+        Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components)
+        Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components)
+        Me.hideContainerBottom = New DevExpress.XtraBars.Docking.AutoHideContainer()
+        Me.DockPanel3 = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer()
+        Me.listboxLog = New DevExpress.XtraEditors.ListBoxControl()
+        Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel4 = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel4_Container = New DevExpress.XtraBars.Docking.ControlContainer()
+        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
+        Me.BindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
+        Me.listboxFiles = New DevExpress.XtraEditors.ListBoxControl()
+        Me.DockPanel2 = New DevExpress.XtraBars.Docking.DockPanel()
+        Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.Document1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.hideContainerBottom.SuspendLayout()
+        Me.DockPanel3.SuspendLayout()
+        Me.DockPanel3_Container.SuspendLayout()
+        CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.panelContainer1.SuspendLayout()
+        Me.DockPanel4.SuspendLayout()
+        Me.DockPanel4_Container.SuspendLayout()
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.DockPanel1.SuspendLayout()
+        Me.DockPanel1_Container.SuspendLayout()
+        CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.DockPanel2.SuspendLayout()
+        Me.DockPanel2_Container.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'DocumentGroup1
+        '
+        Me.DocumentGroup1.Items.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.Document() {Me.Document1})
+        '
+        'Document1
+        '
+        Me.Document1.Caption = "Document Viewer"
+        Me.Document1.ControlName = "DockPanel2"
+        Me.Document1.FloatLocation = New System.Drawing.Point(0, 0)
+        Me.Document1.FloatSize = New System.Drawing.Size(200, 200)
+        Me.Document1.Properties.AllowClose = DevExpress.Utils.DefaultBoolean.[False]
+        Me.Document1.Properties.AllowFloat = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Document1.Properties.AllowFloatOnDoubleClick = DevExpress.Utils.DefaultBoolean.[True]
+        '
+        'RibbonControl1
+        '
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.ButtonSelectFiles, Me.ButtonImportFiles, Me.buttonClearLog, Me.buttonClearFiles, Me.TextboxObjectId, Me.ButtonLoadFile, Me.BarListItem1, Me.BarButtonItem2, Me.BarToggleSwitchItem1, Me.BarDockingMenuItem1, Me.BarMdiChildrenListItem1, Me.BarButtonItem1})
+        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+        Me.RibbonControl1.MaxItemId = 14
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarDockingMenuItem1)
+        Me.RibbonControl1.PageHeaderItemLinks.Add(Me.BarMdiChildrenListItem1)
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1})
+        Me.RibbonControl1.Size = New System.Drawing.Size(1310, 158)
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'ButtonSelectFiles
+        '
+        Me.ButtonSelectFiles.Caption = "Select Files..."
+        Me.ButtonSelectFiles.Id = 1
+        Me.ButtonSelectFiles.ImageOptions.SvgImage = CType(resources.GetObject("ButtonSelectFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.ButtonSelectFiles.Name = "ButtonSelectFiles"
+        '
+        'ButtonImportFiles
+        '
+        Me.ButtonImportFiles.Caption = "Import Files"
+        Me.ButtonImportFiles.Id = 2
+        Me.ButtonImportFiles.ImageOptions.SvgImage = CType(resources.GetObject("ButtonImportFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.ButtonImportFiles.Name = "ButtonImportFiles"
+        '
+        'buttonClearLog
+        '
+        Me.buttonClearLog.Caption = "Clear Log"
+        Me.buttonClearLog.Id = 3
+        Me.buttonClearLog.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearLog.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonClearLog.Name = "buttonClearLog"
+        '
+        'buttonClearFiles
+        '
+        Me.buttonClearFiles.Caption = "Clear Files"
+        Me.buttonClearFiles.Id = 4
+        Me.buttonClearFiles.ImageOptions.SvgImage = CType(resources.GetObject("buttonClearFiles.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonClearFiles.Name = "buttonClearFiles"
+        '
+        'TextboxObejctId
+        '
+        Me.TextboxObjectId.Caption = "Document Id"
+        Me.TextboxObjectId.Edit = Me.RepositoryItemTextEdit1
+        Me.TextboxObjectId.EditWidth = 100
+        Me.TextboxObjectId.Id = 5
+        Me.TextboxObjectId.ImageOptions.SvgImage = CType(resources.GetObject("TextboxObejctId.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.TextboxObjectId.Name = "TextboxObejctId"
+        '
+        'RepositoryItemTextEdit1
+        '
+        Me.RepositoryItemTextEdit1.AutoHeight = False
+        Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1"
+        '
+        'ButtonLoadFile
+        '
+        Me.ButtonLoadFile.Caption = "Load File"
+        Me.ButtonLoadFile.Id = 6
+        Me.ButtonLoadFile.ImageOptions.SvgImage = CType(resources.GetObject("ButtonLoadFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.ButtonLoadFile.Name = "ButtonLoadFile"
+        '
+        'BarListItem1
+        '
+        Me.BarListItem1.Caption = "Strategy"
+        Me.BarListItem1.Id = 7
+        Me.BarListItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarListItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarListItem1.Name = "BarListItem1"
+        Me.BarListItem1.Strings.AddRange(New Object() {"Small Files", "Big Files", "Mixed Files"})
+        '
+        'BarButtonItem2
+        '
+        Me.BarButtonItem2.Caption = "List Files"
+        Me.BarButtonItem2.Id = 9
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
+        'BarToggleSwitchItem1
+        '
+        Me.BarToggleSwitchItem1.Caption = "Load File every 3 Seconds"
+        Me.BarToggleSwitchItem1.Id = 10
+        Me.BarToggleSwitchItem1.Name = "BarToggleSwitchItem1"
+        '
+        'BarDockingMenuItem1
+        '
+        Me.BarDockingMenuItem1.Caption = "BarDockingMenuItem1"
+        Me.BarDockingMenuItem1.Id = 11
+        Me.BarDockingMenuItem1.Name = "BarDockingMenuItem1"
+        '
+        'BarMdiChildrenListItem1
+        '
+        Me.BarMdiChildrenListItem1.Caption = "BarMdiChildrenListItem1"
+        Me.BarMdiChildrenListItem1.Id = 12
+        Me.BarMdiChildrenListItem1.Name = "BarMdiChildrenListItem1"
+        '
+        'RibbonPage1
+        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup4, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Name = "RibbonPage1"
+        Me.RibbonPage1.Text = "Start"
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.ButtonSelectFiles)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.ButtonImportFiles)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "Import"
+        '
+        'RibbonPageGroup4
+        '
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.TextboxObjectId)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarToggleSwitchItem1)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.ButtonLoadFile)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
+        Me.RibbonPageGroup4.Text = "Retrieve"
+        '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearLog, True)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.buttonClearFiles)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        Me.RibbonPageGroup3.Text = "Utils"
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 640)
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1310, 24)
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        Me.RibbonPage2.Text = "RibbonPage2"
+        '
+        'DocumentManager1
+        '
+        Me.DocumentManager1.ContainerControl = Me
+        Me.DocumentManager1.MenuManager = Me.RibbonControl1
+        Me.DocumentManager1.View = Me.TabbedView1
+        Me.DocumentManager1.ViewCollection.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseView() {Me.TabbedView1})
+        '
+        'TabbedView1
+        '
+        Me.TabbedView1.DocumentGroups.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup() {Me.DocumentGroup1})
+        Me.TabbedView1.Documents.AddRange(New DevExpress.XtraBars.Docking2010.Views.BaseDocument() {Me.Document1})
+        DockingContainer1.Element = Me.DocumentGroup1
+        Me.TabbedView1.RootContainer.Nodes.AddRange(New DevExpress.XtraBars.Docking2010.Views.Tabbed.DockingContainer() {DockingContainer1})
+        '
+        'DockManager1
+        '
+        Me.DockManager1.AutoHideContainers.AddRange(New DevExpress.XtraBars.Docking.AutoHideContainer() {Me.hideContainerBottom})
+        Me.DockManager1.Form = Me
+        Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelContainer1, Me.DockPanel2})
+        Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"})
+        '
+        'hideContainerBottom
+        '
+        Me.hideContainerBottom.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer))
+        Me.hideContainerBottom.Controls.Add(Me.DockPanel3)
+        Me.hideContainerBottom.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.hideContainerBottom.Location = New System.Drawing.Point(0, 619)
+        Me.hideContainerBottom.Name = "hideContainerBottom"
+        Me.hideContainerBottom.Size = New System.Drawing.Size(1310, 21)
+        '
+        'DockPanel3
+        '
+        Me.DockPanel3.Controls.Add(Me.DockPanel3_Container)
+        Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Bottom
+        Me.DockPanel3.FloatVertical = True
+        Me.DockPanel3.ID = New System.Guid("b0b62b80-3cf3-4f78-a50d-4a79b9cabc39")
+        Me.DockPanel3.Location = New System.Drawing.Point(0, 0)
+        Me.DockPanel3.Name = "DockPanel3"
+        Me.DockPanel3.Options.ShowCloseButton = False
+        Me.DockPanel3.OriginalSize = New System.Drawing.Size(200, 119)
+        Me.DockPanel3.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Bottom
+        Me.DockPanel3.SavedIndex = 0
+        Me.DockPanel3.Size = New System.Drawing.Size(1310, 119)
+        Me.DockPanel3.Text = "Log"
+        Me.DockPanel3.Visibility = DevExpress.XtraBars.Docking.DockVisibility.AutoHide
+        '
+        'DockPanel3_Container
+        '
+        Me.DockPanel3_Container.Controls.Add(Me.listboxLog)
+        Me.DockPanel3_Container.Location = New System.Drawing.Point(3, 27)
+        Me.DockPanel3_Container.Name = "DockPanel3_Container"
+        Me.DockPanel3_Container.Size = New System.Drawing.Size(1304, 89)
+        Me.DockPanel3_Container.TabIndex = 0
+        '
+        'listboxLog
+        '
+        Me.listboxLog.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.listboxLog.Location = New System.Drawing.Point(0, 0)
+        Me.listboxLog.Name = "listboxLog"
+        Me.listboxLog.Size = New System.Drawing.Size(1304, 89)
+        Me.listboxLog.TabIndex = 0
+        '
+        'panelContainer1
+        '
+        Me.panelContainer1.ActiveChild = Me.DockPanel4
+        Me.panelContainer1.Controls.Add(Me.DockPanel4)
+        Me.panelContainer1.Controls.Add(Me.DockPanel1)
+        Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
+        Me.panelContainer1.ID = New System.Guid("17067a8c-1b48-4d4a-b383-b7f8d5a8be59")
+        Me.panelContainer1.Location = New System.Drawing.Point(0, 158)
+        Me.panelContainer1.Name = "panelContainer1"
+        Me.panelContainer1.Options.ShowCloseButton = False
+        Me.panelContainer1.OriginalSize = New System.Drawing.Size(451, 200)
+        Me.panelContainer1.Size = New System.Drawing.Size(451, 461)
+        Me.panelContainer1.Tabbed = True
+        Me.panelContainer1.Text = "panelContainer1"
+        '
+        'DockPanel4
+        '
+        Me.DockPanel4.Controls.Add(Me.DockPanel4_Container)
+        Me.DockPanel4.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
+        Me.DockPanel4.ID = New System.Guid("bddc849b-1066-4d2f-8fd3-9bc377a2bd74")
+        Me.DockPanel4.Location = New System.Drawing.Point(3, 26)
+        Me.DockPanel4.Name = "DockPanel4"
+        Me.DockPanel4.Options.ShowCloseButton = False
+        Me.DockPanel4.OriginalSize = New System.Drawing.Size(200, 200)
+        Me.DockPanel4.Size = New System.Drawing.Size(444, 406)
+        Me.DockPanel4.Text = "List Files"
+        '
+        'DockPanel4_Container
+        '
+        Me.DockPanel4_Container.Controls.Add(Me.GridControl1)
+        Me.DockPanel4_Container.Location = New System.Drawing.Point(0, 0)
+        Me.DockPanel4_Container.Name = "DockPanel4_Container"
+        Me.DockPanel4_Container.Size = New System.Drawing.Size(444, 406)
+        Me.DockPanel4_Container.TabIndex = 0
+        '
+        'GridControl1
+        '
+        Me.GridControl1.DataSource = Me.BindingSource1
+        Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.GridControl1.Location = New System.Drawing.Point(0, 0)
+        Me.GridControl1.MainView = Me.GridView1
+        Me.GridControl1.MenuManager = Me.RibbonControl1
+        Me.GridControl1.Name = "GridControl1"
+        Me.GridControl1.Size = New System.Drawing.Size(444, 406)
+        Me.GridControl1.TabIndex = 0
+        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
+        '
+        'BindingSource1
+        '
+        '
+        'GridView1
+        '
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2})
+        Me.GridView1.GridControl = Me.GridControl1
+        Me.GridView1.Name = "GridView1"
+        Me.GridView1.OptionsBehavior.Editable = False
+        Me.GridView1.OptionsBehavior.ReadOnly = True
+        '
+        'GridColumn1
+        '
+        Me.GridColumn1.Caption = "Object Id"
+        Me.GridColumn1.FieldName = "IDB_OBJ_ID"
+        Me.GridColumn1.MaxWidth = 100
+        Me.GridColumn1.MinWidth = 100
+        Me.GridColumn1.Name = "GridColumn1"
+        Me.GridColumn1.Visible = True
+        Me.GridColumn1.VisibleIndex = 0
+        Me.GridColumn1.Width = 100
+        '
+        'GridColumn2
+        '
+        Me.GridColumn2.Caption = "Document Name"
+        Me.GridColumn2.FieldName = "DocName"
+        Me.GridColumn2.Name = "GridColumn2"
+        Me.GridColumn2.Visible = True
+        Me.GridColumn2.VisibleIndex = 1
+        Me.GridColumn2.Width = 409
+        '
+        'DockPanel1
+        '
+        Me.DockPanel1.Controls.Add(Me.DockPanel1_Container)
+        Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
+        Me.DockPanel1.ID = New System.Guid("12b5eead-07cc-48c6-93a4-85cd0b4b82ce")
+        Me.DockPanel1.Location = New System.Drawing.Point(3, 26)
+        Me.DockPanel1.Name = "DockPanel1"
+        Me.DockPanel1.Options.ShowCloseButton = False
+        Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200)
+        Me.DockPanel1.Size = New System.Drawing.Size(444, 406)
+        Me.DockPanel1.Text = "Files to Upload"
+        '
+        'DockPanel1_Container
+        '
+        Me.DockPanel1_Container.Controls.Add(Me.listboxFiles)
+        Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0)
+        Me.DockPanel1_Container.Name = "DockPanel1_Container"
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(444, 406)
+        Me.DockPanel1_Container.TabIndex = 0
+        '
+        'listboxFiles
+        '
+        Me.listboxFiles.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.listboxFiles.Location = New System.Drawing.Point(0, 0)
+        Me.listboxFiles.Name = "listboxFiles"
+        Me.listboxFiles.Size = New System.Drawing.Size(444, 406)
+        Me.listboxFiles.TabIndex = 1
+        '
+        'DockPanel2
+        '
+        Me.DockPanel2.Controls.Add(Me.DockPanel2_Container)
+        Me.DockPanel2.DockedAsTabbedDocument = True
+        Me.DockPanel2.ID = New System.Guid("e82850af-b594-49e9-ae83-36d4bf007da5")
+        Me.DockPanel2.Name = "DockPanel2"
+        Me.DockPanel2.Options.ShowCloseButton = False
+        Me.DockPanel2.OriginalSize = New System.Drawing.Size(200, 200)
+        Me.DockPanel2.Text = "Document Viewer"
+        '
+        'DockPanel2_Container
+        '
+        Me.DockPanel2_Container.Controls.Add(Me.DocumentViewer1)
+        Me.DockPanel2_Container.Location = New System.Drawing.Point(0, 0)
+        Me.DockPanel2_Container.Name = "DockPanel2_Container"
+        Me.DockPanel2_Container.Size = New System.Drawing.Size(853, 432)
+        Me.DockPanel2_Container.TabIndex = 0
+        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(853, 432)
+        Me.DocumentViewer1.TabIndex = 0
+        '
+        'Timer1
+        '
+        Me.Timer1.Interval = 3000
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Open Log Directory"
+        Me.BarButtonItem1.Id = 13
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'Form1
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1310, 664)
+        Me.Controls.Add(Me.panelContainer1)
+        Me.Controls.Add(Me.hideContainerBottom)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
+        Me.Name = "Form1"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
+        Me.Text = "Form1"
+        CType(Me.DocumentGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.Document1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DocumentManager1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.hideContainerBottom.ResumeLayout(False)
+        Me.DockPanel3.ResumeLayout(False)
+        Me.DockPanel3_Container.ResumeLayout(False)
+        CType(Me.listboxLog, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.panelContainer1.ResumeLayout(False)
+        Me.DockPanel4.ResumeLayout(False)
+        Me.DockPanel4_Container.ResumeLayout(False)
+        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.DockPanel1.ResumeLayout(False)
+        Me.DockPanel1_Container.ResumeLayout(False)
+        CType(Me.listboxFiles, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.DockPanel2.ResumeLayout(False)
+        Me.DockPanel2_Container.ResumeLayout(False)
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+    Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents ButtonSelectFiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents ButtonImportFiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents buttonClearLog As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents buttonClearFiles As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents TextboxObjectId As DevExpress.XtraBars.BarEditItem
+    Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
+    Friend WithEvents ButtonLoadFile As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarListItem1 As DevExpress.XtraBars.BarListItem
+    Friend WithEvents DocumentManager1 As DevExpress.XtraBars.Docking2010.DocumentManager
+    Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel
+    Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer
+    Friend WithEvents listboxFiles As DevExpress.XtraEditors.ListBoxControl
+    Friend WithEvents listboxLog As DevExpress.XtraEditors.ListBoxControl
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
+    Friend WithEvents TabbedView1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView
+    Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager
+    Friend WithEvents DockPanel3 As DevExpress.XtraBars.Docking.DockPanel
+    Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer
+    Friend WithEvents DocumentGroup1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.DocumentGroup
+    Friend WithEvents Document1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.Document
+    Friend WithEvents DockPanel2 As DevExpress.XtraBars.Docking.DockPanel
+    Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel
+    Friend WithEvents DockPanel4 As DevExpress.XtraBars.Docking.DockPanel
+    Friend WithEvents DockPanel4_Container As DevExpress.XtraBars.Docking.ControlContainer
+    Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents hideContainerBottom As DevExpress.XtraBars.Docking.AutoHideContainer
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents BindingSource1 As BindingSource
+    Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem
+    Friend WithEvents Timer1 As Timer
+    Friend WithEvents BarDockingMenuItem1 As DevExpress.XtraBars.BarDockingMenuItem
+    Friend WithEvents BarMdiChildrenListItem1 As DevExpress.XtraBars.BarMdiChildrenListItem
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+End Class
--- a/GUIs.Test.EDMIBenchmark/Form1.resx
+++ b/GUIs.Test.EDMIBenchmark/Form1.resx
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ButtonSelectFiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iT3BlbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
+        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0
+        MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJN
+        Mi4yLDI1LjJsNS41LTEyYzAuMy0wLjcsMS0xLjIsMS44LTEuMkgyNlY5YzAtMC42LTAuNC0xLTEtMUgx
+        MlY1YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw0LDIsNC40LDIsNXYyMCAgIGMwLDAuMiwwLDAuMywwLjEs
+        MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
+        ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
+        NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="ButtonImportFiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iSW1wb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxN3Yx
+        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
+        MTRMMjIsMTd6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
+        b24gcG9pbnRzPSIzMCw2IDIyLDYgMjIsMiAxNCw4IDIyLDE0IDIyLDEwIDMwLDEwICAiIGNsYXNzPSJH
+        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="buttonClearLog.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAK8DAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJfUGl2b3RfVGFibGUiIHN0eWxlPSJlbmFibGUtYmFja2dyb3Vu
+        ZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDojRDEx
+        QzFDO30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQo8L3N0eWxlPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTAsMTBI
+        NlY2aDRWMTB6IE0yNCw2SDEydjRoMTJWNnogTTEwLDEySDZ2MTJoNFYxMnoiIGNsYXNzPSJCbHVlIiAv
+        Pg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0xOSwyMy4zTDE2LjMsMjZjLTAuNCwwLjQtMC40LDEuMiwwLDEu
+        Nmw0LDRjMC40LDAuNCwxLjIsMC40LDEuNiwwbDIuNy0yLjdMMTksMjMuM3oiIGNsYXNzPSJCbHVlIiAv
+        Pg0KICA8cGF0aCBkPSJNMTQsMjYuOGMwLTAuMywwLjEtMC42LDAuMS0wLjhINFY0aDIydjEwLjFjMC4z
+        LTAuMSwwLjUtMC4xLDAuOC0wLjFjMC40LDAsMC44LDAuMSwxLjIsMC4yVjMgIGMwLTAuNi0wLjQtMS0x
+        LTFIM0MyLjQsMiwyLDIuNCwyLDN2MjRjMCwwLjYsMC40LDEsMSwxaDExLjJDMTQuMSwyNy42LDE0LDI3
+        LjIsMTQsMjYuOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTMxLjcsMjAuNGwtNC00Yy0w
+        LjQtMC40LTEuMi0wLjQtMS42LDBsLTYuMSw2LjFsNS42LDUuNmw2LjEtNi4xQzMyLjEsMjEuNSwzMi4x
+        LDIwLjgsMzEuNywyMC40eiIgY2xhc3M9IlJlZCIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="buttonClearFiles.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy
+        IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5CbHVl
+        e2ZpbGw6IzExNzdENzt9Cjwvc3R5bGU+DQogIDxwYXRoIGQ9Ik0xNi4xLDIzLjFsLTQuNCw0LjRjLTAu
+        NywwLjctMS45LDAuNy0yLjYsMGwtNi42LTYuNmMtMC43LTAuNy0wLjctMS45LDAtMi42TDYuOSwxNEwx
+        Ni4xLDIzLjF6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPHBhdGggZD0iTTI3LjUsMTEuOGwtMTAsMTBsLTku
+        Mi05LjJsMTAtMTBjMC43LTAuNywxLjktMC43LDIuNiwwbDYuNiw2LjZDMjguMiw5LjksMjguMiwxMSwy
+        Ny41LDExLjh6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="TextboxObejctId.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MTYgMTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        R3JlZW57ZmlsbDojMDM5QzIzO30KCS5XaGl0ZXtmaWxsOiNGRkZGRkY7fQoJLnN0MHtvcGFjaXR5OjAu
+        Njt9Cgkuc3Qxe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTE1LDFIMUMwLjUsMSww
+        LDEuNSwwLDJ2MTJjMCwwLjUsMC41LDEsMSwxaDE0YzAuNSwwLDEtMC41LDEtMVYyQzE2LDEuNSwxNS41
+        LDEsMTUsMXogTTE1LDE0SDFWMmgxNFYxNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTAs
+        NVYyYzAtMC41LDAuNS0xLDEtMWgxNGMwLjYsMCwxLDAuNSwxLDF2M0gweiIgY2xhc3M9IkdyZWVuIiAv
+        Pg0KICA8ZyBpZD0iTGF5ZXJfMiIgY2xhc3M9InN0MCI+DQogICAgPHJlY3QgeD0iMSIgeT0iMiIgd2lk
+        dGg9IjE0IiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IldoaXRlIiAvPg0KICA8L2c+DQog
+        IDxyZWN0IHg9IjEiIHk9IjUiIHdpZHRoPSIxNCIgaGVpZ2h0PSI5IiByeD0iMCIgcnk9IjAiIGNsYXNz
+        PSJXaGl0ZSIgLz4NCiAgPHBhdGggZD0iTTUsMTJWN2gxdjVINXoiIGNsYXNzPSJCbGFjayIgLz4NCiAg
+        PHBhdGggZD0iTTExLDEyaC0xbDAtMC42QzkuOCwxMS42LDkuNSwxMiw4LjcsMTJjLTAuNSwwLTAuOS0w
+        LjItMS4yLTAuNUM3LjIsMTEuMiw3LDEwLjcsNywxMC4xQzcsOS41LDcuMiw5LDcuNSw4LjcgIGMwLjMt
+        MC4zLDAuNy0wLjUsMS4yLTAuNXMwLjksMC4yLDEuMiwwLjVWN0gxMVYxMnogTTguMSwxMC4xYzAsMC40
+        LDAsMS4yLDAuOSwxLjJjMC44LDAsMC45LTAuOCwwLjktMS4xQzkuOSw5LjgsOS44LDksOSw5ICBDOC4z
+        LDksOC4xLDkuNyw4LjEsMTAuMXoiIGNsYXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="ButtonLoadFile.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHQiPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzgu
+        MywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTE2LDI0
+        bC04LThoNlY4aDR2OGg2TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="BarListItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMMDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJLUElfeDVGX0RlZmlu
+        aXRpb24iPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMjYsOS4yIDI2LDAgMTIsMTQgOCwxMCAyLDE2IDIs
+        MjQgMTEuMiwyNCAgIiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTYsMzJoMjZWNkw2LDMy
+        eiBNMjYsMjZoLTUuNWw1LjUtNS41VjI2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+
+        Cw==
+</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMEDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MTYgMTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
+        V2hpdGV7ZmlsbDojRkZGRkZGO30KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLnN0MHtvcGFjaXR5OjAu
+        Njt9Cgkuc3Qxe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTE1LDFIMUMwLjUsMSww
+        LDEuNSwwLDJ2MTFjMCwwLjUsMC41LDEsMSwxaDE0YzAuNSwwLDEtMC41LDEtMVYyQzE2LDEuNSwxNS41
+        LDEsMTUsMXogTTE1LDEzSDFWMmgxNFYxM3oiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBhdGggZD0iTTAs
+        NVYyYzAtMC41LDAuNS0xLDEtMWgxNGMwLjYsMCwxLDAuNSwxLDF2M0gweiIgY2xhc3M9IkdyZWVuIiAv
+        Pg0KICA8ZyBpZD0iTGF5ZXJfMiIgY2xhc3M9InN0MCI+DQogICAgPHJlY3QgeD0iMSIgeT0iMiIgd2lk
+        dGg9IjE0IiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IldoaXRlIiAvPg0KICA8L2c+DQog
+        IDxyZWN0IHg9IjEiIHk9IjUiIHdpZHRoPSIxNCIgaGVpZ2h0PSI4IiByeD0iMCIgcnk9IjAiIGNsYXNz
+        PSJXaGl0ZSIgLz4NCiAgPGcgaWQ9IkxheWVyXzMiIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0x
+        NSw4VjdoLTNWNWgtMXYySDVWNUg0djJIMXYxaDN2MkgxdjFoM3YyaDF2LTJoNnYyaDF2LTJoM3YtMWgt
+        M1Y4SDE1eiBNMTEsMTBINVY4aDZWMTB6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="DocumentManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="BindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>316, 17</value>
+  </metadata>
+  <metadata name="DockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>181, 17</value>
+  </metadata>
+  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>453, 17</value>
+  </metadata>
+</root>
--- a/GUIs.Test.EDMIBenchmark/Form1.vb
+++ b/GUIs.Test.EDMIBenchmark/Form1.vb
@@ -0,0 +1,213 @@
+Imports System.ServiceModel
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMI.API
+Imports DevExpress.XtraEditors
+Imports DevExpress.XtraEditors.Controls
+Imports System.IO
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
+
+Public Class Form1
+    Private _LogConfig As LogConfig
+    Private _Logger As Logger
+    Private _Client As Client
+
+    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Try
+            _LogConfig = New LogConfig(LogConfig.PathType.Temp, Nothing, "EDMIBenschmark")
+            _Logger = _LogConfig.GetLogger()
+            _Client = New Client(_LogConfig, "172.24.12.39", 9000)
+            _Client.Connect()
+
+            DocumentViewer1.Init(_LogConfig, "21182889975216572111813147150675976632")
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub AddLogMessage(Message As String)
+        _Logger.Info(Message)
+        listboxLog.Items.Add(Message)
+        listboxLog.MakeItemVisible(listboxLog.Items.Count - 1)
+    End Sub
+
+    Private Sub ButtonSelectFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonSelectFiles.ItemClick
+        Dim oDialog As New OpenFileDialog() With {
+            .Multiselect = True,
+            .CheckFileExists = True
+        }
+        Dim oResult = oDialog.ShowDialog()
+
+        If oResult = DialogResult.OK Then
+            For Each oFileName In oDialog.FileNames
+                listboxFiles.Items.Add(oFileName)
+            Next
+        End If
+    End Sub
+
+    Private Async Sub ButtonImportFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonImportFiles.ItemClick
+        Try
+            Dim oFiles As New List(Of String)
+            Dim oSWTotal As New Stopwatch()
+            oSWTotal.Start()
+
+            For Each oItem As String In listboxFiles.Items
+                Dim oSW As New Stopwatch()
+                oSW.Start()
+                Dim oFileName As String = oItem
+                Dim oFileInfo As New FileInfo(oFileName)
+
+                AddLogMessage($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})")
+
+                Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.Name, "WichtigesDokument", 1, 0)
+                AddLogMessage($"File with Id [{oObjectId}] imported!")
+                oSW.Stop()
+                AddLogMessage($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}")
+                AddLogMessage("")
+            Next
+
+            oSWTotal.Stop()
+            AddLogMessage($"Total Time: {FormatTime(oSWTotal.ElapsedMilliseconds)}")
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, Text)
+        End Try
+    End Sub
+
+    Private Sub buttonClearLog_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonClearLog.ItemClick
+        listboxLog.Items.Clear()
+    End Sub
+
+    Private Sub buttonClearFiles_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonClearFiles.ItemClick
+        listboxFiles.Items.Clear()
+    End Sub
+
+    Public Function FormatTime(Milliseconds As Integer) As String
+        If Milliseconds < 1000 Then
+            Return Milliseconds & " ms"
+        Else
+            Return (Milliseconds / 1000) & " s"
+        End If
+    End Function
+
+    Dim DoubleBytes As Double
+    Public Function FormatBytes(ByVal BytesCaller As ULong) As String
+
+        Try
+            Select Case BytesCaller
+                Case Is >= 1099511627776
+                    DoubleBytes = CDbl(BytesCaller / 1099511627776) 'TB
+                    Return FormatNumber(DoubleBytes, 2) & " TB"
+                Case 1073741824 To 1099511627775
+                    DoubleBytes = CDbl(BytesCaller / 1073741824) 'GB
+                    Return FormatNumber(DoubleBytes, 2) & " GB"
+                Case 1048576 To 1073741823
+                    DoubleBytes = CDbl(BytesCaller / 1048576) 'MB
+                    Return FormatNumber(DoubleBytes, 2) & " MB"
+                Case 1024 To 1048575
+                    DoubleBytes = CDbl(BytesCaller / 1024) 'KB
+                    Return FormatNumber(DoubleBytes, 2) & " KB"
+                Case 0 To 1023
+                    DoubleBytes = BytesCaller ' bytes
+                    Return FormatNumber(DoubleBytes, 2) & " bytes"
+                Case Else
+                    Return ""
+            End Select
+        Catch
+            Return ""
+        End Try
+
+    End Function
+
+    Private Async Sub ButtonLoadFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonLoadFile.ItemClick
+        Try
+            Dim oSWTotal As New Stopwatch()
+            oSWTotal.Start()
+
+            If TextboxObjectId.EditValue = "" Then
+                MsgBox("Please enter an object id!", MsgBoxStyle.Exclamation, "Uh oh!")
+            End If
+
+            Dim oObjectId As Integer = TextboxObjectId.EditValue
+            Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId)
+
+            DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream)
+
+            oSWTotal.Stop()
+            AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]")
+        Catch ex As FaultException
+            MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service")
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!")
+        End Try
+    End Sub
+
+    Private Async Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Try
+            Dim oResult As Client.FileList = Await _Client.ListFilesForUserAsync()
+            BindingSource1.DataSource = oResult.Datatable
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!")
+        End Try
+    End Sub
+
+    Private Async Sub BindingSource1_CurrentChanged(sender As Object, e As EventArgs) Handles BindingSource1.CurrentChanged
+        Dim oRow As DataRow = GridView1.GetFocusedDataRow()
+
+        If oRow Is Nothing Then
+            Exit Sub
+        End If
+
+        Try
+            Dim oSWTotal As New Stopwatch()
+            oSWTotal.Start()
+
+            Dim oObjectId As Long = oRow.Item("IDB_OBJ_ID")
+            Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId)
+
+            DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream)
+
+            oSWTotal.Stop()
+            AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]")
+        Catch ex As FaultException
+            MsgBox(ex.Reason.ToString, MsgBoxStyle.Critical, "Error from Service")
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Uh oh!")
+        End Try
+    End Sub
+
+    Private Async Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
+        Try
+            Dim oSWTotal As New Stopwatch()
+            oSWTotal.Start()
+
+            Dim oObjectId As Integer = TextboxObjectId.EditValue
+
+            Dim oResponse As Client.StreamedFile = Await _Client.GetFileByObjectIdAsync(oObjectId)
+
+            DocumentViewer1.LoadFile(oResponse.FileName, oResponse.Stream)
+
+            oSWTotal.Stop()
+            AddLogMessage($"File [{oResponse.FileName}] loaded: [{FormatTime(oSWTotal.ElapsedMilliseconds)}]")
+        Catch ex As Exception
+            AddLogMessage($"Error while getting file: [{ex.Message}]")
+        End Try
+    End Sub
+
+    Private Sub BarToggleSwitchItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItem1.CheckedChanged
+        If BarToggleSwitchItem1.Checked Then
+            If TextboxObjectId.EditValue = "" Then
+                Timer1.Stop()
+                MsgBox("Please set a ObjectId!", MsgBoxStyle.Critical, Text)
+            Else
+                Timer1.Start()
+                AddLogMessage("Timer Started!")
+            End If
+        Else
+            Timer1.Stop()
+            AddLogMessage("Timer Stopped!")
+        End If
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Process.Start(_LogConfig.LogDirectory)
+    End Sub
+End Class
--- a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj
+++ b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{5FDEC007-7AE0-4829-B1AE-6165E29375DA}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>GUIs.Test.EDMIBenchmark.My.MyApplication</StartupObject>
+    <RootNamespace>GUIs.Test.EDMIBenchmark</RootNamespace>
+    <AssemblyName>GUIs.Test.EDMIBenchmark</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>WindowsForms</MyType>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>GUIs.Test.EDMIBenchmark.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>GUIs.Test.EDMIBenchmark.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionExplicit>On</OptionExplicit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionCompare>Binary</OptionCompare>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionStrict>Off</OptionStrict>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OptionInfer>On</OptionInfer>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Sparkline.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DigitalData.Controls.DocumentViewer">
+      <HintPath>..\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Controls.LookupGrid">
+      <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14">
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="Independentsoft.Msg">
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Linq" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+    <Import Include="System.Threading.Tasks" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Form1.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.vb">
+      <DependentUpon>Form1.vb</DependentUpon>
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="My Project\licenses.licx" />
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
+      <Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
+      <Name>DocumentViewer</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
+      <Project>{25017513-0d97-49d3-98d7-ba76d9b251b0}</Project>
+      <Name>EDMI.API</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
+      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
+      <Name>Logging</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+</Project>
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -0,0 +1,38 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
+    '
+    Partial Friend Class MyApplication
+
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
+        Public Sub New()
+            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
+            Me.IsSingleInstance = false
+            Me.EnableVisualStyles = true
+            Me.SaveMySettingsOnExit = true
+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
+        End Sub
+
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
+        Protected Overrides Sub OnCreateMainForm()
+            Me.MainForm = Global.GUIs.Test.EDMIBenchmark.Form1
+        End Sub
+    End Class
+End Namespace
--- a/GUIs.Test.EDMIBenchmark/My
+++ b/GUIs.Test.EDMIBenchmark/My
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <MySubMain>true</MySubMain>
+  <MainForm>Form1</MainForm>
+  <SingleInstance>false</SingleInstance>
+  <ShutdownMode>0</ShutdownMode>
+  <EnableVisualStyles>true</EnableVisualStyles>
+  <AuthenticationMode>0</AuthenticationMode>
+  <ApplicationType>0</ApplicationType>
+  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
+</MyApplicationData>
--- a/GUIs.Test.EDMIBenchmark/My
+++ b/GUIs.Test.EDMIBenchmark/My
@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' Allgemeine Informationen über eine Assembly werden über die folgenden
+' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
+' die einer Assembly zugeordnet sind.
+
+' Werte der Assemblyattribute überprüfen
+
+<Assembly: AssemblyTitle("GUIs.Test.EDMIBenchmark")>
+<Assembly: AssemblyDescription("")>
+<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyProduct("GUIs.Test.EDMIBenchmark")>
+<Assembly: AssemblyCopyright("Copyright ©  2020")>
+<Assembly: AssemblyTrademark("")>
+
+<Assembly: ComVisible(False)>
+
+'Die folgende GUID wird für die typelib-ID verwendet, wenn dieses Projekt für COM verfügbar gemacht wird.
+<Assembly: Guid("a89a679a-e39a-4227-8425-0205431edf60")>
+
+' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+'
+'      Hauptversion
+'      Nebenversion
+'      Buildnummer
+'      Revision
+'
+' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
+' indem Sie "*" wie unten gezeigt eingeben:
+' <Assembly: AssemblyVersion("1.0.*")>
+
+<Assembly: AssemblyVersion("1.0.0.0")>
+<Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My.Resources
+
+    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'class via a tool like ResGen or Visual Studio.
+    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'with the /str option, or rebuild your VS project.
+    '''<summary>
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
+    Friend Module Resources
+
+        Private resourceMan As Global.System.Resources.ResourceManager
+
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+
+        '''<summary>
+        '''  Returns the cached ResourceManager instance used by this class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("GUIs.Test.EDMIBenchmark.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+
+        '''<summary>
+        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  resource lookups using this strongly typed resource class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set(ByVal value As Global.System.Globalization.CultureInfo)
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace
--- a/GUIs.Test.EDMIBenchmark/My
+++ b/GUIs.Test.EDMIBenchmark/My
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
+
+#Region "My.Settings Auto-Save Functionality"
+#If _MyType = "WindowsForms" Then
+        Private Shared addedHandler As Boolean
+
+        Private Shared addedHandlerLockObject As New Object
+
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+            If My.Application.SaveMySettingsOnExit Then
+                My.Settings.Save()
+            End If
+        End Sub
+#End If
+#End Region
+
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+
+#If _MyType = "WindowsForms" Then
+                   If Not addedHandler Then
+                        SyncLock addedHandlerLockObject
+                            If Not addedHandler Then
+                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                                addedHandler = True
+                            End If
+                        End SyncLock
+                    End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
+    Friend Module MySettingsProperty
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
+        Friend ReadOnly Property Settings() As Global.GUIs.Test.EDMIBenchmark.My.MySettings
+            Get
+                Return Global.GUIs.Test.EDMIBenchmark.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
--- a/GUIs.Test.EDMIBenchmark/My
+++ b/GUIs.Test.EDMIBenchmark/My
@@ -0,0 +1,5 @@
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.Test.EDMIBenchmark/packages.config
+++ b/GUIs.Test.EDMIBenchmark/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="4.7.0" targetFramework="net472" />
+</packages>
--- a/GUIs.Test.ZUGFeRDTest/Form1.vb
+++ b/GUIs.Test.ZUGFeRDTest/Form1.vb
@@ -20,7 +20,7 @@ Public Class Form1


    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
-        _logConfig = New LogConfig(LogConfig.PathType.CurrentDirectory)
+        _logConfig = New LogConfig(LogConfig.PathType.CustomPath, Application.StartupPath & "\Log", Nothing, My.Application.Info.CompanyName, My.Application.Info.ProductName)
        _logConfig.Debug = True
        _firebird = New Firebird(_logConfig, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PASS)
        _mssql = New MSSQLServer(_logConfig, My.Settings.MSSQL_CONNECTIONSTRING)
@@ -88,7 +88,7 @@ Public Class Form1
        args = LoadFolderConfig(args)
        args = LoadPropertyMapFor(args, "DEFAULT")

-        Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, _mssql)
+        Dim job As New Jobs.ImportZUGFeRDFiles(_logConfig, _firebird, 1, _mssql)

        job.Start(args)
    End Sub
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -183,7 +183,7 @@
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\GUIs.ClipboardWatcher\ClipboardWatcher.vbproj">
-      <Project>{b7d465a2-ae31-4cdf-a8b2-34b42d3ea84e}</Project>
+      <Project>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</Project>
      <Name>ClipboardWatcher</Name>
    </ProjectReference>
    <ProjectReference Include="..\Modules.Config\Config.vbproj">
--- a/Modules.Config/ConfigManager.vb
+++ b/Modules.Config/ConfigManager.vb
@@ -90,8 +90,7 @@ Public Class ConfigManager(Of T)
        _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)

        If ApplicationStartupPath <> String.Empty Then
-            _AppConfigDirectory = _File.CreateDirectory(ApplicationStartupPath)
-            _AppConfigPath = Path.Combine(_AppConfigDirectory, APP_CONFIG_NAME)
+            _AppConfigPath = Path.Combine(ApplicationStartupPath, APP_CONFIG_NAME)
        End If

        _WriteAllValuesToUserConfig = ForceUserConfig
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("0.0.7.0")>
+<Assembly: AssemblyVersion("0.0.7.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Database/Database.vbproj
+++ b/Modules.Database/Database.vbproj
@@ -93,6 +93,7 @@
    <Compile Include="Constants.vb" />
    <Compile Include="Exceptions.vb" />
    <Compile Include="Firebird.vb" />
+    <Compile Include="IDatabase.vb" />
    <Compile Include="ODBC.vb" />
    <Compile Include="Oracle.vb" />
    <Compile Include="MSSQLServer.vb" />
--- a/Modules.Database/IDatabase.vb
+++ b/Modules.Database/IDatabase.vb
@@ -0,0 +1,12 @@
+Imports System.Data.Common
+
+Public Interface IDatabase
+    Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable
+    Function GetDatatable(SqlCommand As String) As DataTable
+
+    Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean
+    Function ExecuteNonQuery(SQLCommand As String) As Boolean
+
+    Function GetScalarValue(SQLQuery As String, Timeout As Integer) As Object
+    Function GetScalarValue(SQLQuery As String) As Object
+End Interface
--- a/Modules.Database/MSSQLServer.vb
+++ b/Modules.Database/MSSQLServer.vb
@@ -1,7 +1,10 @@
-Imports System.Data.SqlClient
+Imports System.Data.Common
+Imports System.Data.SqlClient
 Imports DigitalData.Modules.Logging

 Public Class MSSQLServer
+    Implements IDatabase
+
    Public DBInitialized As Boolean = False
    Public CurrentSQLConnectionString As String = ""

@@ -40,7 +43,7 @@ Public Class MSSQLServer
        Dim oConnectionStringBuilder As New SqlConnectionStringBuilder() With {
            .DataSource = Server,
            .InitialCatalog = Database,
-            .UserId = UserId,
+            .UserID = UserId,
            .Password = Password
        }

@@ -89,12 +92,14 @@ Public Class MSSQLServer
    ''' </summary>
    ''' <param name="SqlCommand">sqlcommand for datatable (select XYZ from TableORView)</param>
    ''' <returns>Returns a datatable</returns>
-    Public Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable
+    Public Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable Implements IDatabase.GetDatatable
        Try
            If TestCanConnect() = False Then
                Return Nothing
            End If

+            _Logger.Debug("Running Query: {0}", SqlCommand)
+
            Using oConnection = GetSQLConnection()
                Using oSQLCOmmand = oConnection.CreateCommand()
                    oSQLCOmmand.CommandText = SqlCommand
@@ -113,7 +118,7 @@ Public Class MSSQLServer
        End Try
    End Function

-    Public Function GetDatatable(SqlCommand As String) As DataTable
+    Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable
        Return GetDatatable(SqlCommand, _Timeout)
    End Function

@@ -128,12 +133,14 @@ Public Class MSSQLServer
        Return ExecuteNonQuery(executeStatement)
    End Function

-    Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean
+    Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
        Try
            If TestCanConnect() = False Then
                Return Nothing
            End If

+            _Logger.Debug("Running Query: {0}", SQLCommand)
+
            Using oConnection = GetSQLConnection()
                Using oSQLCOmmand = oConnection.CreateCommand()
                    oSQLCOmmand.CommandText = SQLCommand
@@ -149,7 +156,7 @@ Public Class MSSQLServer
        End Try
    End Function

-    Public Function ExecuteNonQuery(SQLCommand As String) As Boolean
+    Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
        Return ExecuteNonQuery(SQLCommand, _Timeout)
    End Function

@@ -163,15 +170,17 @@ Public Class MSSQLServer
        Return GetScalarValue(ScalarSQL)
    End Function

-    Public Function GetScalarValue(SQLQuery As String, Timeout As Integer) As Object
+    Public Function GetScalarValue(SQLCommand As String, Timeout As Integer) As Object Implements IDatabase.GetScalarValue
        Try
            If TestCanConnect() = False Then
                Return Nothing
            End If

+            _Logger.Debug("Running Query: {0}", SQLCommand)
+
            Using oConnection As SqlConnection = GetSQLConnection()
                Using oSQLCOmmand = oConnection.CreateCommand()
-                    oSQLCOmmand.CommandText = SQLQuery
+                    oSQLCOmmand.CommandText = SQLCommand
                    oSQLCOmmand.CommandTimeout = Timeout
                    Dim oResult As Object = oSQLCOmmand.ExecuteScalar()
                    Return oResult
@@ -179,39 +188,76 @@ Public Class MSSQLServer
            End Using
        Catch ex As Exception
            _Logger.Error(ex)
-            _Logger.Warn("SQLQuery: " & SQLQuery)
+            _Logger.Warn("SQLQuery: " & SQLCommand)
            Return Nothing
        End Try
    End Function

-    Public Function GetScalarValue(SQLQuery As String) As Object
+    Public Function GetScalarValue(SQLQuery As String) As Object Implements IDatabase.GetScalarValue
        Return GetScalarValue(SQLQuery, _Timeout)
    End Function

+    Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String, Timeout As Integer) As Object
+        Try
+            If TestCanConnect() = False Then
+                Return Nothing
+            End If
+
+            _Logger.Debug("Running Query: {0}", SQLCommand)
+
+            If SQLCommand.CommandText.Contains(" ") Then
+                SQLCommand.CommandType = CommandType.Text
+            Else
+                SQLCommand.CommandType = CommandType.StoredProcedure
+            End If
+
+            Using oConnection As SqlConnection = GetSQLConnection()
+
+                SQLCommand.Connection = oConnection
+                SQLCommand.Parameters(OutputParameter).Direction = ParameterDirection.Output
+                SQLCommand.CommandTimeout = Timeout
+                SQLCommand.ExecuteNonQuery()
+                oConnection.Close()
+
+                Return SQLCommand.Parameters(OutputParameter).Value
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Warn("SQLQuery: " & SQLCommand.CommandText)
+            Return Nothing
+        End Try
+    End Function
+
+    Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String) As Object
+        Return GetScalarValue(SQLCommand, OutputParameter, _Timeout)
+    End Function
+
    ''' <summary>
    ''' Executes the passed sql-statement in asyncmode
    ''' </summary>
-    ''' <param name="executeStatement">the sql statement</param>
+    ''' <param name="SqlCommand">the sql statement</param>
    ''' <param name="commandtimeout">Optional Timeout</param>
    ''' <remarks></remarks>
-    Public Sub NewExecuteNonQueryAsync(executeStatement As String, Optional commandtimeout As Integer = 120)
+    Public Sub NewExecuteNonQueryAsync(SqlCommand As String, Optional commandtimeout As Integer = 120)
        If TestCanConnect() = False Then
            Exit Sub
        End If

+        _Logger.Debug("Running Query: {0}", SqlCommand)
+
        Try
            Dim oCallback As New AsyncCallback(AddressOf NewExecuteNonQueryAsync_Callback)

            Using oConnection As SqlConnection = GetSQLConnection()
                Using oSQLCOmmand = oConnection.CreateCommand()
-                    oSQLCOmmand.CommandText = executeStatement
+                    oSQLCOmmand.CommandText = SqlCommand
                    oSQLCOmmand.CommandTimeout = commandtimeout
                    oSQLCOmmand.BeginExecuteNonQuery(oCallback, oSQLCOmmand)
                End Using
            End Using
        Catch ex As Exception
            _Logger.Error(ex)
-            _Logger.Warn("executeStatement: " & executeStatement)
+            _Logger.Warn("executeStatement: " & SqlCommand)
        End Try
    End Sub

--- a/Modules.EDMIAPI/Channel.vb
+++ b/Modules.EDMIAPI/Channel.vb
@@ -1,23 +0,0 @@
-Imports System.ServiceModel
-Imports System.Xml
-
-Public Class Channel
-    Public Shared Function GetBinding(Optional AuthenticationMode As TcpClientCredentialType = TcpClientCredentialType.Windows) As NetTcpBinding
-        Return New NetTcpBinding() With {
-                .MaxReceivedMessageSize = Constants.MAX_RECEIVED_MESSAGE_SIZE,
-                .MaxBufferSize = Constants.MAX_BUFFER_SIZE,
-                .MaxBufferPoolSize = Constants.MAX_BUFFER_POOL_SIZE,
-                .MaxConnections = Constants.MAX_CONNECTIONS,
-                .Security = New NetTcpSecurity() With {
-                    .Mode = SecurityMode.Transport,
-                    .Transport = New TcpTransportSecurity() With {
-                        .ClientCredentialType = AuthenticationMode
-                    }
-                },
-                .ReaderQuotas = New XmlDictionaryReaderQuotas() With {
-                    .MaxArrayLength = Constants.MAX_ARRAY_LENGTH,
-                    .MaxStringContentLength = Constants.MAX_STRING_CONTENT_LENGTH
-                }
-            }
-    End Function
-End Class
--- a/Modules.EDMIAPI/Client.vb
+++ b/Modules.EDMIAPI/Client.vb
@@ -0,0 +1,166 @@
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
+Imports System.ServiceModel
+Imports System.IO
+
+Public Class Client
+    Private ReadOnly _logger As Logger
+    Private ReadOnly _channelFactory As ChannelFactory(Of IEDMIServiceChannel)
+    Private _channel As IEDMIServiceChannel
+
+    Public Class StreamedFile
+        Public Stream As MemoryStream
+        Public FileName As String
+    End Class
+
+    Public Class FileList
+        Public Datatable As DataTable
+    End Class
+
+    ''' <summary>
+    ''' Creates a new EDMIAPI object
+    ''' </summary>
+    ''' <param name="LogConfig">LogConfig object</param>
+    ''' <param name="ServiceAdress">The full service url to connect to</param>
+    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
+        _logger = LogConfig.GetLogger()
+
+        Try
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress(ServiceAdress)
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    Public Sub New(LogConfig As LogConfig, IPAddress As String, PortNumber As Integer)
+        _logger = LogConfig.GetLogger()
+
+        Try
+            Dim oBinding = Channel.GetBinding()
+            Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
+
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    ''' <summary>
+    ''' Connect to the service
+    ''' </summary>
+    ''' <returns>True if connection was successful, false otherwise</returns>
+    Public Function Connect() As Boolean
+        Try
+            _channel = GetChannel()
+
+            _logger.Debug("Opening channel..")
+            _channel.Open()
+
+            _logger.Info("Connection to Service established!")
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Imports a file by filename
+    ''' </summary>
+    ''' <returns>A document object</returns>
+    Public Async Function ImportFileAsync(FilePath As String, DocumentType As String, ObjectStoreId As Long, Optional RetentionDays As Integer = 0) As Task(Of Long)
+        Try
+            Dim oFileInfo As New FileInfo(FilePath)
+            If oFileInfo.Exists = False Then
+                Throw New FileNotFoundException("Cannot import non-existing file.", FilePath)
+            End If
+
+            Using oStream As New FileStream(FilePath, FileMode.Open)
+                Dim oContents As Byte() = {}
+                Dim oBytesRead = Await oStream.ReadAsync(oContents, 0, oStream.Length)
+                Dim oData As New DocumentImportRequest() With {
+                    .FileName = oFileInfo.Name,
+                    .Contents = oContents,
+                    .DocumentType = DocumentType,
+                    .ObjectStoreId = ObjectStoreId,
+                    .RetentionDays = RetentionDays
+                }
+
+                Dim oResponse = Await _channel.ImportFileAsync(oData)
+
+                Return oResponse.ObjectId
+            End Using
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Async Function GetFileByObjectIdAsync(ObjectId As Long) As Task(Of StreamedFile)
+        Try
+            Dim oData As New DocumentStreamRequest() With {.ObjectId = ObjectId}
+            Dim oResponse As DocumentStreamResponse = Await _channel.GetFileByObjectIdAsync(oData)
+            Dim oMemoryStream As New MemoryStream()
+            oResponse.FileContents.CopyTo(oMemoryStream)
+            oMemoryStream.Position = 0
+
+            Return New StreamedFile() With {
+                .Stream = oMemoryStream,
+                .FileName = oResponse.FileName
+            }
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Async Function ListFilesForUserAsync() As Task(Of FileList)
+        Try
+            Dim oResponse As DocumentListResponse = Await _channel.ListFilesForUserAsync(New ListFilesForUserRequest())
+            Return New FileList() With {
+                .Datatable = oResponse.Datatable
+            }
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' Aborts the channel and creates a new connection
+    ''' </summary>
+    Private Sub Reconnect()
+        _logger.Warn("Connection faulted. Trying to reconnect..")
+
+        Try
+            _channel.Abort()
+            _channel = GetChannel()
+            _channel.Open()
+        Catch ex As Exception
+            _logger.Error(ex)
+        End Try
+    End Sub
+
+    ''' <summary>
+    ''' Creates a channel and adds a Faulted-Handler
+    ''' </summary>
+    ''' <returns>A channel object</returns>
+    Private Function GetChannel() As IEDMIServiceChannel
+        Try
+            _logger.Debug("Creating channel..")
+            Dim oChannel = _channelFactory.CreateChannel()
+
+            AddHandler oChannel.Faulted, AddressOf Reconnect
+
+            Return oChannel
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+End Class
--- a/Modules.EDMIAPI/Client/Channel.vb
+++ b/Modules.EDMIAPI/Client/Channel.vb
@@ -0,0 +1,38 @@
+Imports System.ServiceModel
+Imports System.Xml
+
+
+Public Class Channel
+    ' Infos about MaxBufferSize and MaxBufferPoolSize
+    ' https://social.msdn.microsoft.com/Forums/vstudio/en-US/d6e234d3-942f-4e9d-8470-32618d3f3212/maxbufferpoolsize-vs-maxbuffersize?forum=wcf
+
+    Public Const MAX_RECEIVED_MESSAGE_SIZE = 2147483647 ' 1GB
+    Public Const MAX_BUFFER_SIZE = 2147483647 ' 10MB
+    Public Const MAX_BUFFER_POOL_SIZE = 2147483647 ' 40MB
+
+    Public Const MAX_CONNECTIONS = 500
+    Public Const MAX_ARRAY_LENGTH = 2147483647
+    Public Const MAX_STRING_CONTENT_LENGTH = 2147483647
+
+    Public Shared Function GetBinding(Optional AuthenticationMode As TcpClientCredentialType = TcpClientCredentialType.Windows) As NetTcpBinding
+        Return New NetTcpBinding() With {
+            .MaxReceivedMessageSize = MAX_RECEIVED_MESSAGE_SIZE,
+            .MaxBufferSize = MAX_BUFFER_SIZE,
+            .MaxBufferPoolSize = MAX_BUFFER_POOL_SIZE,
+            .MaxConnections = MAX_CONNECTIONS,
+            .TransferMode = TransferMode.Streamed,
+            .Security = New NetTcpSecurity() With {
+                .Mode = SecurityMode.Transport,
+                .Transport = New TcpTransportSecurity() With {
+                    .ClientCredentialType = AuthenticationMode
+                }
+            },
+            .ReaderQuotas = New XmlDictionaryReaderQuotas() With {
+                .MaxArrayLength = MAX_ARRAY_LENGTH,
+                .MaxStringContentLength = MAX_STRING_CONTENT_LENGTH
+            }
+        }
+    End Function
+End Class
+
+
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentImportResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentListResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentResultOld" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="DocumentStreamResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="NonQueryResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.NonQueryResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ScalarResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource
@@ -6,5 +6,5 @@
    cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="TableResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult</TypeInfo>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Modules.Filesystem.xsd
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.EDMIService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <xsd:schema targetNamespace="http://DigitalData.Services.EDMIService/Imports">
+      <xsd:import namespace="http://DigitalData.Services.EDMIService" />
+      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
+      <xsd:import namespace="http://schemas.microsoft.com/Message" />
+    </xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="IEDMIService_Heartbeat_InputMessage">
+    <wsdl:part name="parameters" element="tns:Heartbeat" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_Heartbeat_OutputMessage">
+    <wsdl:part name="parameters" element="tns:HeartbeatResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_CreateDatabaseRequest_InputMessage">
+    <wsdl:part name="parameters" element="tns:CreateDatabaseRequest" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_CreateDatabaseRequest_OutputMessage">
+    <wsdl:part name="parameters" element="tns:CreateDatabaseRequestResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_CloseDatabaseRequest_InputMessage">
+    <wsdl:part name="parameters" element="tns:CloseDatabaseRequest" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_CloseDatabaseRequest_OutputMessage">
+    <wsdl:part name="parameters" element="tns:CloseDatabaseRequestResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ReturnDatatable_InputMessage">
+    <wsdl:part name="parameters" element="tns:ReturnDatatable" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ReturnDatatable_OutputMessage">
+    <wsdl:part name="parameters" element="tns:ReturnDatatableResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ReturnScalar_InputMessage">
+    <wsdl:part name="parameters" element="tns:ReturnScalar" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ReturnScalar_OutputMessage">
+    <wsdl:part name="parameters" element="tns:ReturnScalarResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_InputMessage">
+    <wsdl:part name="parameters" element="tns:ExecuteNonQuery" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ExecuteNonQuery_OutputMessage">
+    <wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_NewFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:NewFile" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_NewFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:NewFileResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_UpdateFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:UpdateFile" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_UpdateFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:UpdateFileResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetFile" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetFileResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_DeleteFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:DeleteFile" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_DeleteFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetDocumentByDocumentId_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentIdResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetDocumentByContainerId_InputMessage">
+    <wsdl:part name="parameters" element="tns:GetDocumentByContainerId" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_GetDocumentByContainerId_OutputMessage">
+    <wsdl:part name="parameters" element="tns:GetDocumentByContainerIdResponse" />
+  </wsdl:message>
+  <wsdl:message name="DocumentImportRequest">
+    <wsdl:part name="parameters" element="tns:DocumentImportRequest" />
+  </wsdl:message>
+  <wsdl:message name="DocumentImportResponse">
+    <wsdl:part name="parameters" element="tns:DocumentImportResponse" />
+  </wsdl:message>
+  <wsdl:message name="DocumentStreamRequest">
+    <wsdl:part name="parameters" element="tns:DocumentStreamRequest" />
+  </wsdl:message>
+  <wsdl:message name="DocumentStreamResponse">
+    <wsdl:part name="parameters" element="tns:DocumentStreamResponse" />
+  </wsdl:message>
+  <wsdl:message name="DocumentStreamResponse_Headers">
+    <wsdl:part name="FileName" element="tns:FileName" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ListFilesForUser_InputMessage" />
+  <wsdl:message name="DocumentListResponse">
+    <wsdl:part name="parameters" element="tns:DocumentListResponse" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_NewFileIndex_InputMessage">
+    <wsdl:part name="parameters" element="tns:NewFileIndex" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_NewFileIndex_OutputMessage">
+    <wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
+  </wsdl:message>
+  <wsdl:portType name="IEDMIService">
+    <wsdl:operation name="Heartbeat">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat" message="tns:IEDMIService_Heartbeat_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse" message="tns:IEDMIService_Heartbeat_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="CreateDatabaseRequest">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" message="tns:IEDMIService_CreateDatabaseRequest_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestResponse" message="tns:IEDMIService_CreateDatabaseRequest_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="CloseDatabaseRequest">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" message="tns:IEDMIService_CloseDatabaseRequest_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse" message="tns:IEDMIService_CloseDatabaseRequest_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="ReturnDatatable">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" message="tns:IEDMIService_ReturnDatatable_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse" message="tns:IEDMIService_ReturnDatatable_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="ReturnScalar">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" message="tns:IEDMIService_ReturnScalar_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse" message="tns:IEDMIService_ReturnScalar_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="ExecuteNonQuery">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" message="tns:IEDMIService_ExecuteNonQuery_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse" message="tns:IEDMIService_ExecuteNonQuery_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="NewFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" message="tns:IEDMIService_NewFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse" message="tns:IEDMIService_NewFile_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="UpdateFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" message="tns:IEDMIService_UpdateFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse" message="tns:IEDMIService_UpdateFile_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="GetFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" message="tns:IEDMIService_GetFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse" message="tns:IEDMIService_GetFile_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="DeleteFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" message="tns:IEDMIService_DeleteFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse" message="tns:IEDMIService_DeleteFile_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="GetDocumentByDocumentId">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" message="tns:IEDMIService_GetDocumentByDocumentId_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdResponse" message="tns:IEDMIService_GetDocumentByDocumentId_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="GetDocumentByContainerId">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" message="tns:IEDMIService_GetDocumentByContainerId_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResponse" message="tns:IEDMIService_GetDocumentByContainerId_OutputMessage" />
+    </wsdl:operation>
+    <wsdl:operation name="ImportFile">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" name="DocumentImportRequest" message="tns:DocumentImportRequest" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" name="DocumentImportResponse" message="tns:DocumentImportResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="GetFileByObjectId">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" name="DocumentStreamRequest" message="tns:DocumentStreamRequest" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse" name="DocumentStreamResponse" message="tns:DocumentStreamResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="ListFilesForUser">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser" message="tns:IEDMIService_ListFilesForUser_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
+    </wsdl:operation>
+    <wsdl:operation name="NewFileIndex">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" message="tns:IEDMIService_NewFileIndex_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse" message="tns:IEDMIService_NewFileIndex_OutputMessage" />
+    </wsdl:operation>
+  </wsdl:portType>
+</wsdl:definitions>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://DigitalData.Services.IDBService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.IDBService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" />
+<xs:schema xmlns:tns="http://DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" />
  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
-  <xs:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
+  <xs:import namespace="http://schemas.microsoft.com/Message" />
  <xs:element name="Heartbeat">
    <xs:complexType>
      <xs:sequence />
@@ -50,7 +50,7 @@
  <xs:element name="ReturnDatatableResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ReturnDatatableResult" nillable="true" type="q1:TableResult" />
+        <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnDatatableResult" nillable="true" type="q1:TableResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -64,7 +64,7 @@
  <xs:element name="ReturnScalarResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ReturnScalarResult" nillable="true" type="q2:ScalarResult" />
+        <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ReturnScalarResult" nillable="true" type="q2:ScalarResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -78,7 +78,7 @@
  <xs:element name="ExecuteNonQueryResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ExecuteNonQueryResult" nillable="true" type="q3:NonQueryResult" />
+        <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ExecuteNonQueryResult" nillable="true" type="q3:NonQueryResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -93,7 +93,7 @@
  <xs:element name="NewFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResult" />
+        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileResult" nillable="true" type="q4:DocumentResultOld" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -108,7 +108,7 @@
  <xs:element name="UpdateFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="UpdateFileResult" nillable="true" type="q6:DocumentResult" />
+        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="UpdateFileResult" nillable="true" type="q6:DocumentResultOld" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -122,7 +122,7 @@
  <xs:element name="GetFileResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetFileResult" nillable="true" type="q8:DocumentResult" />
+        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetFileResult" nillable="true" type="q8:DocumentResultOld" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -140,23 +140,6 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="ImportFile">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/System.IO" minOccurs="0" name="FileInfo" nillable="true" type="q10:FileInfo" />
-        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
-        <xs:element minOccurs="0" name="ReadOnly" type="xs:boolean" />
-        <xs:element minOccurs="0" name="RetentionTime" type="xs:int" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="ImportFileResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="ImportFileResult" nillable="true" type="q11:DocumentResult2" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
  <xs:element name="GetDocumentByDocumentId">
    <xs:complexType>
      <xs:sequence>
@@ -167,7 +150,7 @@
  <xs:element name="GetDocumentByDocumentIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q12:DocumentResult" />
+        <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByDocumentIdResult" nillable="true" type="q10:DocumentResultOld" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -181,14 +164,67 @@
  <xs:element name="GetDocumentByContainerIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q13:DocumentResult" />
+        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="GetDocumentByContainerIdResult" nillable="true" type="q11:DocumentResultOld" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="DocumentImportRequest">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
+        <xs:element minOccurs="0" name="DocumentType" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="ObjectStoreId" type="xs:long" />
+        <xs:element minOccurs="0" name="RetentionDays" type="xs:long" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="DocumentImportResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="DocumentStreamRequest">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="DocumentStreamResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q12="http://schemas.microsoft.com/Message" name="FileContents" type="q12:StreamBody" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="FileName" nillable="true" type="xs:string" />
+  <xs:element name="DocumentListResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="Datatable" nillable="true">
+          <xs:complexType>
+            <xs:annotation>
+              <xs:appinfo>
+                <ActualType Name="DataTable" Namespace="http://schemas.datacontract.org/2004/07/System.Data" xmlns="http://schemas.microsoft.com/2003/10/Serialization/">
+                </ActualType>
+              </xs:appinfo>
+            </xs:annotation>
+            <xs:sequence>
+              <xs:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax" />
+              <xs:any minOccurs="1" namespace="urn:schemas-microsoft-com:xml-diffgram-v1" processContents="lax" />
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:sequence>
    </xs:complexType>
  </xs:element>
  <xs:element name="NewFileIndex">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q14:DocumentObject" />
+        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" minOccurs="0" name="DocObject" nillable="true" type="q13:DocumentObject" />
        <xs:element minOccurs="0" name="Syskey" nillable="true" type="xs:string" />
        <xs:element minOccurs="0" name="LanguageCode" nillable="true" type="xs:string" />
        <xs:element minOccurs="0" name="Value" nillable="true" type="xs:string" />
@@ -198,7 +234,7 @@
  <xs:element name="NewFileIndexResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q15:IndexResult" />
+        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q14:IndexResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService1.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
  <xs:complexType name="TableResult">
    <xs:complexContent mixed="false">
@@ -49,7 +49,7 @@
    </xs:complexContent>
  </xs:complexType>
  <xs:element name="NonQueryResult" nillable="true" type="tns:NonQueryResult" />
-  <xs:complexType name="DocumentResult">
+  <xs:complexType name="DocumentResultOld">
    <xs:complexContent mixed="false">
      <xs:extension base="tns:BaseResult">
        <xs:sequence>
@@ -60,25 +60,7 @@
      </xs:extension>
    </xs:complexContent>
  </xs:complexType>
-  <xs:element name="DocumentResult" nillable="true" type="tns:DocumentResult" />
-  <xs:complexType name="DocumentResult2">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:BaseResult">
-        <xs:sequence>
-          <xs:element name="Contents" nillable="true" type="xs:base64Binary" />
-          <xs:element name="Document" nillable="true" type="tns:DocumentResult2.DocumentObject" />
-          <xs:element name="HasContents" type="xs:boolean" />
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="DocumentResult2" nillable="true" type="tns:DocumentResult2" />
-  <xs:complexType name="DocumentResult2.DocumentObject">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="FileName" nillable="true" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="DocumentResult2.DocumentObject" nillable="true" type="tns:DocumentResult2.DocumentObject" />
+  <xs:element name="DocumentResultOld" nillable="true" type="tns:DocumentResultOld" />
  <xs:complexType name="IndexResult">
    <xs:complexContent mixed="false">
      <xs:extension base="tns:BaseResult">
--- a/Services/EDMIServiceReference/Message.xsd
+++ b/Services/EDMIServiceReference/Message.xsd
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="http://schemas.microsoft.com/Message" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/Message" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:simpleType name="StreamBody">
+    <xs:restriction base="xs:base64Binary" />
+  </xs:simpleType>
+</xs:schema>
--- a/Services/EDMIServiceReference/Reference.svcmap
+++ b/Services/EDMIServiceReference/Reference.svcmap
@@ -22,15 +22,15 @@
    <MetadataSource Address="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" Protocol="mex" SourceId="1" />
  </MetadataSources>
  <Metadata>
-    <MetadataFile FileName="DigitalData.Services.IDBService.wsdl" MetadataType="Wsdl" ID="c1a28c67-687c-489e-a78c-ad8254acdb1a" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.wsdl" MetadataType="Wsdl" ID="d76afc45-9188-477d-84c2-2d5fd8aa1559" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="63e6618a-fa84-4922-b771-92728dee5bd0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService.xsd" MetadataType="Schema" ID="bf8a7780-bd95-4c01-8532-928e7d65f528" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService.xsd" MetadataType="Schema" ID="8b75b395-459e-4678-b979-5e50ebd6a173" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="1d0f216a-7f01-4129-a6bf-26e91c5e631d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="DigitalData.Services.IDBService1.xsd" MetadataType="Schema" ID="7e8d682f-5a2c-4dd4-a7e3-fb3e0b95a585" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="DigitalData.Services.EDMIService1.xsd" MetadataType="Schema" ID="9809989f-5319-4140-b18e-c3bcd5e8d139" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="e0db7004-6943-4cf8-b88f-4811ed14a341" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="System.Data.xsd" MetadataType="Schema" ID="6c7bdb47-eea4-4d03-bc52-9747c865bbf0" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="DigitalData.Modules.Filesystem.xsd" MetadataType="Schema" ID="cfa7fe70-b4f1-4a12-a957-d0134a8e6279" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
-    <MetadataFile FileName="System.IO.xsd" MetadataType="Schema" ID="2af2d8d2-0bc4-42bc-a200-42cecb5bf98e" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
+    <MetadataFile FileName="Message.xsd" MetadataType="Schema" ID="2589e82f-d68f-4843-b153-a80edf895f82" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
  </Metadata>
  <Extensions>
    <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -0,0 +1,751 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:4.0.30319.42000
+'
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+Imports System.Runtime.Serialization
+
+Namespace EDMIServiceReference
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute(),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResultOld)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult))>  _
+    Partial Public Class BaseResult
+        Inherits Object
+        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+        
+        <System.NonSerializedAttribute()>  _
+        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private ErrorMessageField As String
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private OKField As Boolean
+        
+        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
+        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
+            Get
+                Return Me.extensionDataField
+            End Get
+            Set
+                Me.extensionDataField = value
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property ErrorMessage() As String
+            Get
+                Return Me.ErrorMessageField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then
+                    Me.ErrorMessageField = value
+                    Me.RaisePropertyChanged("ErrorMessage")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property OK() As Boolean
+            Get
+                Return Me.OKField
+            End Get
+            Set
+                If (Me.OKField.Equals(value) <> true) Then
+                    Me.OKField = value
+                    Me.RaisePropertyChanged("OK")
+                End If
+            End Set
+        End Property
+        
+        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+        
+        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+            If (Not (propertyChanged) Is Nothing) Then
+                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+            End If
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute(),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.TableResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResultOld)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject))>  _
+    Partial Public Class ScalarResult
+        Inherits EDMIServiceReference.BaseResult
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private ScalarField As Object
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property Scalar() As Object
+            Get
+                Return Me.ScalarField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.ScalarField, value) <> true) Then
+                    Me.ScalarField = value
+                    Me.RaisePropertyChanged("Scalar")
+                End If
+            End Set
+        End Property
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class NonQueryResult
+        Inherits EDMIServiceReference.BaseResult
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResultOld", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class DocumentResultOld
+        Inherits EDMIServiceReference.BaseResult
+        
+        Private ContentsField() As Byte
+        
+        Private DocumentField As EDMIServiceReference.DocumentObject
+        
+        Private HasContentsField As Boolean
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property Contents() As Byte()
+            Get
+                Return Me.ContentsField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
+                    Me.ContentsField = value
+                    Me.RaisePropertyChanged("Contents")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property Document() As EDMIServiceReference.DocumentObject
+            Get
+                Return Me.DocumentField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
+                    Me.DocumentField = value
+                    Me.RaisePropertyChanged("Document")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property HasContents() As Boolean
+            Get
+                Return Me.HasContentsField
+            End Get
+            Set
+                If (Me.HasContentsField.Equals(value) <> true) Then
+                    Me.HasContentsField = value
+                    Me.RaisePropertyChanged("HasContents")
+                End If
+            End Set
+        End Property
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class IndexResult
+        Inherits EDMIServiceReference.BaseResult
+        
+        Private IndexIdField As Long
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property IndexId() As Long
+            Get
+                Return Me.IndexIdField
+            End Get
+            Set
+                If (Me.IndexIdField.Equals(value) <> true) Then
+                    Me.IndexIdField = value
+                    Me.RaisePropertyChanged("IndexId")
+                End If
+            End Set
+        End Property
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class TableResult
+        Inherits EDMIServiceReference.BaseResult
+        
+        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
+        Private TableField As System.Data.DataTable
+        
+        <System.Runtime.Serialization.DataMemberAttribute()>  _
+        Public Property Table() As System.Data.DataTable
+            Get
+                Return Me.TableField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.TableField, value) <> true) Then
+                    Me.TableField = value
+                    Me.RaisePropertyChanged("Table")
+                End If
+            End Set
+        End Property
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem"),  _
+     System.SerializableAttribute()>  _
+    Partial Public Class DocumentObject
+        Inherits Object
+        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
+        
+        <System.NonSerializedAttribute()>  _
+        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
+        
+        Private ContainerIdField As String
+        
+        Private DocumentIdField As Long
+        
+        Private FileNameField As String
+        
+        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
+        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
+            Get
+                Return Me.extensionDataField
+            End Get
+            Set
+                Me.extensionDataField = value
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property ContainerId() As String
+            Get
+                Return Me.ContainerIdField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then
+                    Me.ContainerIdField = value
+                    Me.RaisePropertyChanged("ContainerId")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property DocumentId() As Long
+            Get
+                Return Me.DocumentIdField
+            End Get
+            Set
+                If (Me.DocumentIdField.Equals(value) <> true) Then
+                    Me.DocumentIdField = value
+                    Me.RaisePropertyChanged("DocumentId")
+                End If
+            End Set
+        End Property
+        
+        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
+        Public Property FileName() As String
+            Get
+                Return Me.FileNameField
+            End Get
+            Set
+                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
+                    Me.FileNameField = value
+                    Me.RaisePropertyChanged("FileName")
+                End If
+            End Set
+        End Property
+        
+        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
+        
+        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
+            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
+            If (Not (propertyChanged) Is Nothing) Then
+                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
+            End If
+        End Sub
+    End Class
+    
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.EDMIService", ConfigurationName:="EDMIServiceReference.IEDMIService")>  _
+    Public Interface IEDMIService
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse")>  _
+        Function Heartbeat() As Boolean
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/HeartbeatResponse")>  _
+        Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
+            "e")>  _
+        Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequestRespons"& _ 
+            "e")>  _
+        Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
+            "")>  _
+        Sub CloseDatabaseRequest()
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequestResponse"& _ 
+            "")>  _
+        Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
+        Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableResponse")>  _
+        Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
+        Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalarResponse")>  _
+        Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
+        Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQueryResponse")>  _
+        Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
+        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
+        Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
+        Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
+        Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
+        Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResultOld
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
+        Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
+        Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFileResponse")>  _
+        Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
+            "nse")>  _
+        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResultOld
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
+            "nse")>  _
+        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
+            "onse")>  _
+        Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResultOld
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
+            "onse")>  _
+        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld)
+        
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportRequest) von Nachricht "DocumentImportRequest" nicht mit dem Standardwert (ImportFile) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
+        Function ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
+        Function ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
+        
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentStreamRequest) von Nachricht "DocumentStreamRequest" nicht mit dem Standardwert (GetFileByObjectId) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse")>  _
+        Function GetFileByObjectId(ByVal request As EDMIServiceReference.DocumentStreamRequest) As EDMIServiceReference.DocumentStreamResponse
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse")>  _
+        Function GetFileByObjectIdAsync(ByVal request As EDMIServiceReference.DocumentStreamRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentStreamResponse)
+        
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Vorgang ListFilesForUser weder in RPC noch in einem Dokument eingeschlossen ist.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
+        Function ListFilesForUser(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As EDMIServiceReference.DocumentListResponse
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
+        Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
+        Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult
+        
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndexResponse")>  _
+        Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult)
+    End Interface
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class DocumentImportRequest
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public Contents() As Byte
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
+        Public DocumentType As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
+        Public FileName As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
+        Public ObjectStoreId As Long
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
+        Public RetentionDays As Long
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long)
+            MyBase.New
+            Me.Contents = Contents
+            Me.DocumentType = DocumentType
+            Me.FileName = FileName
+            Me.ObjectStoreId = ObjectStoreId
+            Me.RetentionDays = RetentionDays
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class DocumentImportResponse
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public ObjectId As Long
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal ObjectId As Long)
+            MyBase.New
+            Me.ObjectId = ObjectId
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentStreamRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class DocumentStreamRequest
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public ObjectId As Long
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal ObjectId As Long)
+            MyBase.New
+            Me.ObjectId = ObjectId
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentStreamResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class DocumentStreamResponse
+        
+        <System.ServiceModel.MessageHeaderAttribute([Namespace]:="http://DigitalData.Services.EDMIService")>  _
+        Public FileName As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public FileContents As System.IO.Stream
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal FileName As String, ByVal FileContents As System.IO.Stream)
+            MyBase.New
+            Me.FileName = FileName
+            Me.FileContents = FileContents
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(IsWrapped:=false)>  _
+    Partial Public Class ListFilesForUserRequest
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentListResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class DocumentListResponse
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public Datatable As System.Data.DataTable
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal Datatable As System.Data.DataTable)
+            MyBase.New
+            Me.Datatable = Datatable
+        End Sub
+    End Class
+    
+    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
+    Public Interface IEDMIServiceChannel
+        Inherits EDMIServiceReference.IEDMIService, System.ServiceModel.IClientChannel
+    End Interface
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
+    Partial Public Class EDMIServiceClient
+        Inherits System.ServiceModel.ClientBase(Of EDMIServiceReference.IEDMIService)
+        Implements EDMIServiceReference.IEDMIService
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal endpointConfigurationName As String)
+            MyBase.New(endpointConfigurationName)
+        End Sub
+        
+        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String)
+            MyBase.New(endpointConfigurationName, remoteAddress)
+        End Sub
+        
+        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
+            MyBase.New(endpointConfigurationName, remoteAddress)
+        End Sub
+        
+        Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
+            MyBase.New(binding, remoteAddress)
+        End Sub
+        
+        Public Function Heartbeat() As Boolean Implements EDMIServiceReference.IEDMIService.Heartbeat
+            Return MyBase.Channel.Heartbeat
+        End Function
+        
+        Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.HeartbeatAsync
+            Return MyBase.Channel.HeartbeatAsync
+        End Function
+        
+        Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequest
+            Return MyBase.Channel.CreateDatabaseRequest(Name, Debug)
+        End Function
+        
+        Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.CreateDatabaseRequestAsync
+            Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug)
+        End Function
+        
+        Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequest
+            MyBase.Channel.CloseDatabaseRequest
+        End Sub
+        
+        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequestAsync
+            Return MyBase.Channel.CloseDatabaseRequestAsync
+        End Function
+        
+        Public Function ReturnDatatable(ByVal SQL As String) As EDMIServiceReference.TableResult Implements EDMIServiceReference.IEDMIService.ReturnDatatable
+            Return MyBase.Channel.ReturnDatatable(SQL)
+        End Function
+        
+        Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult) Implements EDMIServiceReference.IEDMIService.ReturnDatatableAsync
+            Return MyBase.Channel.ReturnDatatableAsync(SQL)
+        End Function
+        
+        Public Function ReturnScalar(ByVal SQL As String) As EDMIServiceReference.ScalarResult Implements EDMIServiceReference.IEDMIService.ReturnScalar
+            Return MyBase.Channel.ReturnScalar(SQL)
+        End Function
+        
+        Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult) Implements EDMIServiceReference.IEDMIService.ReturnScalarAsync
+            Return MyBase.Channel.ReturnScalarAsync(SQL)
+        End Function
+        
+        Public Function ExecuteNonQuery(ByVal SQL As String) As EDMIServiceReference.NonQueryResult Implements EDMIServiceReference.IEDMIService.ExecuteNonQuery
+            Return MyBase.Channel.ExecuteNonQuery(SQL)
+        End Function
+        
+        Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult) Implements EDMIServiceReference.IEDMIService.ExecuteNonQueryAsync
+            Return MyBase.Channel.ExecuteNonQueryAsync(SQL)
+        End Function
+        
+        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.NewFile
+            Return MyBase.Channel.NewFile(FileName, Contents)
+        End Function
+        
+        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.NewFileAsync
+            Return MyBase.Channel.NewFileAsync(FileName, Contents)
+        End Function
+        
+        Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.UpdateFile
+            Return MyBase.Channel.UpdateFile(DocObject, Contents)
+        End Function
+        
+        Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.UpdateFileAsync
+            Return MyBase.Channel.UpdateFileAsync(DocObject, Contents)
+        End Function
+        
+        Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetFile
+            Return MyBase.Channel.GetFile(DocObject)
+        End Function
+        
+        Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetFileAsync
+            Return MyBase.Channel.GetFileAsync(DocObject)
+        End Function
+        
+        Public Function DeleteFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As Boolean Implements EDMIServiceReference.IEDMIService.DeleteFile
+            Return MyBase.Channel.DeleteFile(DocObject)
+        End Function
+        
+        Public Function DeleteFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements EDMIServiceReference.IEDMIService.DeleteFileAsync
+            Return MyBase.Channel.DeleteFileAsync(DocObject)
+        End Function
+        
+        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentId
+            Return MyBase.Channel.GetDocumentByDocumentId(DocumentId)
+        End Function
+        
+        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentIdAsync
+            Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId)
+        End Function
+        
+        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResultOld Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerId
+            Return MyBase.Channel.GetDocumentByContainerId(ContainerId)
+        End Function
+        
+        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResultOld) Implements EDMIServiceReference.IEDMIService.GetDocumentByContainerIdAsync
+            Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId)
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse Implements EDMIServiceReference.IEDMIService.ImportFile
+            Return MyBase.Channel.ImportFile(request)
+        End Function
+        
+        Public Function ImportFile(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As Long
+            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
+            inValue.Contents = Contents
+            inValue.DocumentType = DocumentType
+            inValue.FileName = FileName
+            inValue.ObjectStoreId = ObjectStoreId
+            inValue.RetentionDays = RetentionDays
+            Dim retVal As EDMIServiceReference.DocumentImportResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFile(inValue)
+            Return retVal.ObjectId
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse) Implements EDMIServiceReference.IEDMIService.ImportFileAsync
+            Return MyBase.Channel.ImportFileAsync(request)
+        End Function
+        
+        Public Function ImportFileAsync(ByVal Contents() As Byte, ByVal DocumentType As String, ByVal FileName As String, ByVal ObjectStoreId As Long, ByVal RetentionDays As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
+            Dim inValue As EDMIServiceReference.DocumentImportRequest = New EDMIServiceReference.DocumentImportRequest()
+            inValue.Contents = Contents
+            inValue.DocumentType = DocumentType
+            inValue.FileName = FileName
+            inValue.ObjectStoreId = ObjectStoreId
+            inValue.RetentionDays = RetentionDays
+            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileAsync(inValue)
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_GetFileByObjectId(ByVal request As EDMIServiceReference.DocumentStreamRequest) As EDMIServiceReference.DocumentStreamResponse Implements EDMIServiceReference.IEDMIService.GetFileByObjectId
+            Return MyBase.Channel.GetFileByObjectId(request)
+        End Function
+        
+        Public Function GetFileByObjectId(ByVal ObjectId As Long, <System.Runtime.InteropServices.OutAttribute()> ByRef FileContents As System.IO.Stream) As String
+            Dim inValue As EDMIServiceReference.DocumentStreamRequest = New EDMIServiceReference.DocumentStreamRequest()
+            inValue.ObjectId = ObjectId
+            Dim retVal As EDMIServiceReference.DocumentStreamResponse = CType(Me,EDMIServiceReference.IEDMIService).GetFileByObjectId(inValue)
+            FileContents = retVal.FileContents
+            Return retVal.FileName
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_GetFileByObjectIdAsync(ByVal request As EDMIServiceReference.DocumentStreamRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentStreamResponse) Implements EDMIServiceReference.IEDMIService.GetFileByObjectIdAsync
+            Return MyBase.Channel.GetFileByObjectIdAsync(request)
+        End Function
+        
+        Public Function GetFileByObjectIdAsync(ByVal ObjectId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentStreamResponse)
+            Dim inValue As EDMIServiceReference.DocumentStreamRequest = New EDMIServiceReference.DocumentStreamRequest()
+            inValue.ObjectId = ObjectId
+            Return CType(Me,EDMIServiceReference.IEDMIService).GetFileByObjectIdAsync(inValue)
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_ListFilesForUser(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As EDMIServiceReference.DocumentListResponse Implements EDMIServiceReference.IEDMIService.ListFilesForUser
+            Return MyBase.Channel.ListFilesForUser(request)
+        End Function
+        
+        Public Function ListFilesForUser() As System.Data.DataTable
+            Dim inValue As EDMIServiceReference.ListFilesForUserRequest = New EDMIServiceReference.ListFilesForUserRequest()
+            Dim retVal As EDMIServiceReference.DocumentListResponse = CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUser(inValue)
+            Return retVal.Datatable
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse) Implements EDMIServiceReference.IEDMIService.ListFilesForUserAsync
+            Return MyBase.Channel.ListFilesForUserAsync(request)
+        End Function
+        
+        Public Function ListFilesForUserAsync() As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
+            Dim inValue As EDMIServiceReference.ListFilesForUserRequest = New EDMIServiceReference.ListFilesForUserRequest()
+            Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
+        End Function
+        
+        Public Function NewFileIndex(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As EDMIServiceReference.IndexResult Implements EDMIServiceReference.IEDMIService.NewFileIndex
+            Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value)
+        End Function
+        
+        Public Function NewFileIndexAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.IndexResult) Implements EDMIServiceReference.IEDMIService.NewFileIndexAsync
+            Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value)
+        End Function
+    End Class
+End Namespace
--- a/Services/EDMIServiceReference/System.Data.xsd
+++ b/Services/EDMIServiceReference/System.Data.xsd
--- a/Services/EDMIServiceReference/System.xsd
+++ b/Services/EDMIServiceReference/System.xsd
--- a/Services/EDMIServiceReference/configuration.svcinfo
+++ b/Services/EDMIServiceReference/configuration.svcinfo
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+  <behaviors />
+  <bindings>
+    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot; transferMode=&quot;Streamed&quot;&gt;&lt;security&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="tcpBinding" />
+  </bindings>
+  <endpoints>
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;EDMIServiceReference.IEDMIService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;servicePrincipalName value=&quot;host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;EDMIServiceReference.IEDMIService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;servicePrincipalName value=&quot;host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="EDMIServiceReference.IEDMIService" name="tcpBinding" />
+  </endpoints>
+</configurationSnapshot>
--- a/Services/EDMIServiceReference/configuration91.svcinfo
+++ b/Services/EDMIServiceReference/configuration91.svcinfo
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="gcZhEvE0dzQnwKubt3MrVgLmByo=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="kW1pXkU3loV3ggP1jXPpV/Y9PXk=">
  <bindingConfigurations>
    <bindingConfiguration bindingType="netTcpBinding" name="tcpBinding">
      <properties>
@@ -21,8 +21,8 @@
        <property path="/transactionFlow" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>False</serializedValue>
        </property>
-        <property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>Buffered</serializedValue>
+        <property path="/transferMode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Streamed</serializedValue>
        </property>
        <property path="/transactionProtocol" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransactionProtocol, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>OleTransactions</serializedValue>
@@ -121,7 +121,7 @@
    </bindingConfiguration>
  </bindingConfigurations>
  <endpoints>
-    <endpoint name="tcpBinding" contract="IDBServiceReference.IIDBService" bindingType="netTcpBinding" address="net.tcp://localhost:9000/DigitalData/Services/Main" bindingConfiguration="tcpBinding">
+    <endpoint name="tcpBinding" contract="EDMIServiceReference.IEDMIService" bindingType="netTcpBinding" address="net.tcp://localhost:9000/DigitalData/Services/Main" bindingConfiguration="tcpBinding">
      <properties>
        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>net.tcp://localhost:9000/DigitalData/Services/Main</serializedValue>
@@ -136,7 +136,7 @@
          <serializedValue>tcpBinding</serializedValue>
        </property>
        <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>IDBServiceReference.IIDBService</serializedValue>
+          <serializedValue>EDMIServiceReference.IEDMIService</serializedValue>
        </property>
        <property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
@@ -156,14 +156,14 @@
        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
        </property>
-        <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue />
+        <property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works</serializedValue>
        </property>
        <property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
        </property>
-        <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>localhost</serializedValue>
+        <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue />
        </property>
        <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://DigitalData.Services.IDBService" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="IDBService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://DigitalData.Services.EDMIService" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="EDMIService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsp:Policy wsu:Id="tcpBinding_policy">
    <wsp:ExactlyOne>
      <wsp:All>
@@ -28,19 +28,21 @@
            </sp:Layout>
          </wsp:Policy>
        </sp:TransportBinding>
+        <msf:Streamed xmlns:msf="http://schemas.microsoft.com/ws/2006/05/framing/policy">
+        </msf:Streamed>
        <wsaw:UsingAddressing>
        </wsaw:UsingAddressing>
      </wsp:All>
    </wsp:ExactlyOne>
  </wsp:Policy>
-  <wsdl:import namespace="http://DigitalData.Services.IDBService" location="" />
+  <wsdl:import namespace="http://DigitalData.Services.EDMIService" location="" />
  <wsdl:types />
-  <wsdl:binding name="tcpBinding" type="i0:IIDBService">
+  <wsdl:binding name="tcpBinding" type="i0:IEDMIService">
    <wsp:PolicyReference URI="#tcpBinding_policy">
    </wsp:PolicyReference>
    <soap12:binding transport="http://schemas.microsoft.com/soap/tcp" />
    <wsdl:operation name="Heartbeat">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/Heartbeat" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/Heartbeat" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -49,7 +51,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CreateDatabaseRequest">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CreateDatabaseRequest" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -58,7 +60,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="CloseDatabaseRequest">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/CloseDatabaseRequest" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -67,7 +69,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -76,7 +78,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -85,7 +87,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -94,7 +96,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="NewFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/NewFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -103,7 +105,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="UpdateFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/UpdateFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -112,7 +114,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -121,16 +123,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="DeleteFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/DeleteFile" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="ImportFile">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/ImportFile" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/DeleteFile" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -139,7 +132,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByDocumentId">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentId" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -148,7 +141,7 @@
      </wsdl:output>
    </wsdl:operation>
    <wsdl:operation name="GetDocumentByContainerId">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerId" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -156,8 +149,36 @@
        <soap12:body use="literal" />
      </wsdl:output>
    </wsdl:operation>
+    <wsdl:operation name="ImportFile">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" style="document" />
+      <wsdl:input name="DocumentImportRequest">
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output name="DocumentImportResponse">
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="GetFileByObjectId">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" style="document" />
+      <wsdl:input name="DocumentStreamRequest">
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output name="DocumentStreamResponse">
+        <soap12:header message="i0:DocumentStreamResponse_Headers" part="FileName" use="literal" />
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="ListFilesForUser">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output name="DocumentListResponse">
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
    <wsdl:operation name="NewFileIndex">
-      <soap12:operation soapAction="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex" style="document" />
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileIndex" style="document" />
      <wsdl:input>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -166,13 +187,13 @@
      </wsdl:output>
    </wsdl:operation>
  </wsdl:binding>
-  <wsdl:service name="IDBService">
+  <wsdl:service name="EDMIService">
    <wsdl:port name="tcpBinding" binding="tns:tcpBinding">
      <soap12:address location="net.tcp://localhost:9000/DigitalData/Services/Main" />
      <wsa10:EndpointReference>
        <wsa10:Address>net.tcp://localhost:9000/DigitalData/Services/Main</wsa10:Address>
        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
-          <Dns>localhost</Dns>
+          <Spn>host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works</Spn>
        </Identity>
      </wsa10:EndpointReference>
    </wsdl:port>
--- a/Services/EDMIServiceReference/service.xsd
+++ b/Services/EDMIServiceReference/service.xsd
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="DocumentResult2" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="NonQueryResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="DocumentResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="DocumentResult2" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.DocumentResult2, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="IndexResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.IndexResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="ScalarResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.ScalarResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="TableResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMIAPI.IDBServiceReference.TableResult, Connected Services.IDBServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl
+++ b/Services/IDBServiceReference/DigitalData.Services.IDBService.wsdl
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.IDBService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.IDBService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <xsd:schema targetNamespace="http://DigitalData.Services.IDBService/Imports">
-      <xsd:import namespace="http://DigitalData.Services.IDBService" />
-      <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem" />
-      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.IO" />
-    </xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="IIDBService_Heartbeat_InputMessage">
-    <wsdl:part name="parameters" element="tns:Heartbeat" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_Heartbeat_OutputMessage">
-    <wsdl:part name="parameters" element="tns:HeartbeatResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_CreateDatabaseRequest_InputMessage">
-    <wsdl:part name="parameters" element="tns:CreateDatabaseRequest" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_CreateDatabaseRequest_OutputMessage">
-    <wsdl:part name="parameters" element="tns:CreateDatabaseRequestResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_CloseDatabaseRequest_InputMessage">
-    <wsdl:part name="parameters" element="tns:CloseDatabaseRequest" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_CloseDatabaseRequest_OutputMessage">
-    <wsdl:part name="parameters" element="tns:CloseDatabaseRequestResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ReturnDatatable_InputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnDatatable" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ReturnDatatable_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnDatatableResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ReturnScalar_InputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnScalar" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ReturnScalar_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ReturnScalarResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ExecuteNonQuery_InputMessage">
-    <wsdl:part name="parameters" element="tns:ExecuteNonQuery" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ExecuteNonQuery_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ExecuteNonQueryResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_NewFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:NewFile" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_NewFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_UpdateFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:UpdateFile" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_UpdateFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:UpdateFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetFile" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_DeleteFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:DeleteFile" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_DeleteFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:DeleteFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ImportFile_InputMessage">
-    <wsdl:part name="parameters" element="tns:ImportFile" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_ImportFile_OutputMessage">
-    <wsdl:part name="parameters" element="tns:ImportFileResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetDocumentByDocumentId_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentId" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetDocumentByDocumentId_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByDocumentIdResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetDocumentByContainerId_InputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByContainerId" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_GetDocumentByContainerId_OutputMessage">
-    <wsdl:part name="parameters" element="tns:GetDocumentByContainerIdResponse" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_NewFileIndex_InputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileIndex" />
-  </wsdl:message>
-  <wsdl:message name="IIDBService_NewFileIndex_OutputMessage">
-    <wsdl:part name="parameters" element="tns:NewFileIndexResponse" />
-  </wsdl:message>
-  <wsdl:portType name="IIDBService">
-    <wsdl:operation name="Heartbeat">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/Heartbeat" message="tns:IIDBService_Heartbeat_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse" message="tns:IIDBService_Heartbeat_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="CreateDatabaseRequest">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest" message="tns:IIDBService_CreateDatabaseRequest_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse" message="tns:IIDBService_CreateDatabaseRequest_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="CloseDatabaseRequest">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest" message="tns:IIDBService_CloseDatabaseRequest_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse" message="tns:IIDBService_CloseDatabaseRequest_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ReturnDatatable">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable" message="tns:IIDBService_ReturnDatatable_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse" message="tns:IIDBService_ReturnDatatable_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ReturnScalar">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar" message="tns:IIDBService_ReturnScalar_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse" message="tns:IIDBService_ReturnScalar_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ExecuteNonQuery">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery" message="tns:IIDBService_ExecuteNonQuery_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse" message="tns:IIDBService_ExecuteNonQuery_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="NewFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFile" message="tns:IIDBService_NewFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse" message="tns:IIDBService_NewFile_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="UpdateFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/UpdateFile" message="tns:IIDBService_UpdateFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse" message="tns:IIDBService_UpdateFile_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="GetFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetFile" message="tns:IIDBService_GetFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse" message="tns:IIDBService_GetFile_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="DeleteFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFile" message="tns:IIDBService_DeleteFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse" message="tns:IIDBService_DeleteFile_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="ImportFile">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFile" message="tns:IIDBService_ImportFile_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse" message="tns:IIDBService_ImportFile_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="GetDocumentByDocumentId">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId" message="tns:IIDBService_GetDocumentByDocumentId_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdResponse" message="tns:IIDBService_GetDocumentByDocumentId_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="GetDocumentByContainerId">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId" message="tns:IIDBService_GetDocumentByContainerId_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdResponse" message="tns:IIDBService_GetDocumentByContainerId_OutputMessage" />
-    </wsdl:operation>
-    <wsdl:operation name="NewFileIndex">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex" message="tns:IIDBService_NewFileIndex_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse" message="tns:IIDBService_NewFileIndex_OutputMessage" />
-    </wsdl:operation>
-  </wsdl:portType>
-</wsdl:definitions>
--- a/Services/IDBServiceReference/Reference.vb
+++ b/Services/IDBServiceReference/Reference.vb
@@ -1,642 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
-'
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-Imports System
-Imports System.Runtime.Serialization
-
-Namespace IDBServiceReference
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.ScalarResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult))>  _
-    Partial Public Class BaseResult
-        Inherits Object
-        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-        
-        <System.NonSerializedAttribute()>  _
-        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
-        
-        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
-        Private ErrorMessageField As String
-        
-        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
-        Private OKField As Boolean
-        
-        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
-        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
-            Get
-                Return Me.extensionDataField
-            End Get
-            Set
-                Me.extensionDataField = value
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute()>  _
-        Public Property ErrorMessage() As String
-            Get
-                Return Me.ErrorMessageField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then
-                    Me.ErrorMessageField = value
-                    Me.RaisePropertyChanged("ErrorMessage")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute()>  _
-        Public Property OK() As Boolean
-            Get
-                Return Me.OKField
-            End Get
-            Set
-                If (Me.OKField.Equals(value) <> true) Then
-                    Me.OKField = value
-                    Me.RaisePropertyChanged("OK")
-                End If
-            End Set
-        End Property
-        
-        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
-        
-        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
-            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
-            If (Not (propertyChanged) Is Nothing) Then
-                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
-            End If
-        End Sub
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute(),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.TableResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.BaseResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.NonQueryResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentResult2.DocumentObject)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.IndexResult)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentObject)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileInfo)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileSystemInfo))>  _
-    Partial Public Class ScalarResult
-        Inherits IDBServiceReference.BaseResult
-        
-        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
-        Private ScalarField As Object
-        
-        <System.Runtime.Serialization.DataMemberAttribute()>  _
-        Public Property Scalar() As Object
-            Get
-                Return Me.ScalarField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ScalarField, value) <> true) Then
-                    Me.ScalarField = value
-                    Me.RaisePropertyChanged("Scalar")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class NonQueryResult
-        Inherits IDBServiceReference.BaseResult
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class DocumentResult
-        Inherits IDBServiceReference.BaseResult
-        
-        Private ContentsField() As Byte
-        
-        Private DocumentField As IDBServiceReference.DocumentObject
-        
-        Private HasContentsField As Boolean
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Contents() As Byte()
-            Get
-                Return Me.ContentsField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
-                    Me.ContentsField = value
-                    Me.RaisePropertyChanged("Contents")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentObject
-            Get
-                Return Me.DocumentField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
-                    Me.DocumentField = value
-                    Me.RaisePropertyChanged("Document")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property HasContents() As Boolean
-            Get
-                Return Me.HasContentsField
-            End Get
-            Set
-                If (Me.HasContentsField.Equals(value) <> true) Then
-                    Me.HasContentsField = value
-                    Me.RaisePropertyChanged("HasContents")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class DocumentResult2
-        Inherits IDBServiceReference.BaseResult
-        
-        Private ContentsField() As Byte
-        
-        Private DocumentField As IDBServiceReference.DocumentResult2.DocumentObject
-        
-        Private HasContentsField As Boolean
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Contents() As Byte()
-            Get
-                Return Me.ContentsField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ContentsField, value) <> true) Then
-                    Me.ContentsField = value
-                    Me.RaisePropertyChanged("Contents")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentResult2.DocumentObject
-            Get
-                Return Me.DocumentField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.DocumentField, value) <> true) Then
-                    Me.DocumentField = value
-                    Me.RaisePropertyChanged("Document")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property HasContents() As Boolean
-            Get
-                Return Me.HasContentsField
-            End Get
-            Set
-                If (Me.HasContentsField.Equals(value) <> true) Then
-                    Me.HasContentsField = value
-                    Me.RaisePropertyChanged("HasContents")
-                End If
-            End Set
-        End Property
-        
-        <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-         System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-         System.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2.DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-         System.SerializableAttribute()>  _
-        Partial Public Class DocumentObject
-            Inherits Object
-            Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-            
-            <System.NonSerializedAttribute()>  _
-            Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
-            
-            <System.Runtime.Serialization.OptionalFieldAttribute()>  _
-            Private FileNameField As String
-            
-            Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
-                Get
-                    Return Me.extensionDataField
-                End Get
-                Set
-                    Me.extensionDataField = value
-                End Set
-            End Property
-            
-            <System.Runtime.Serialization.DataMemberAttribute()>  _
-            Public Property FileName() As String
-                Get
-                    Return Me.FileNameField
-                End Get
-                Set
-                    If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
-                        Me.FileNameField = value
-                        Me.RaisePropertyChanged("FileName")
-                    End If
-                End Set
-            End Property
-            
-            Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
-            
-            Protected Sub RaisePropertyChanged(ByVal propertyName As String)
-                Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
-                If (Not (propertyChanged) Is Nothing) Then
-                    propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
-                End If
-            End Sub
-        End Class
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class IndexResult
-        Inherits IDBServiceReference.BaseResult
-        
-        Private IndexIdField As Long
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property IndexId() As Long
-            Get
-                Return Me.IndexIdField
-            End Get
-            Set
-                If (Me.IndexIdField.Equals(value) <> true) Then
-                    Me.IndexIdField = value
-                    Me.RaisePropertyChanged("IndexId")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.IDBService"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class TableResult
-        Inherits IDBServiceReference.BaseResult
-        
-        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
-        Private TableField As System.Data.DataTable
-        
-        <System.Runtime.Serialization.DataMemberAttribute()>  _
-        Public Property Table() As System.Data.DataTable
-            Get
-                Return Me.TableField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.TableField, value) <> true) Then
-                    Me.TableField = value
-                    Me.RaisePropertyChanged("Table")
-                End If
-            End Set
-        End Property
-    End Class
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
-     System.Runtime.Serialization.DataContractAttribute(Name:="DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.Filesystem"),  _
-     System.SerializableAttribute()>  _
-    Partial Public Class DocumentObject
-        Inherits Object
-        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
-        
-        <System.NonSerializedAttribute()>  _
-        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
-        
-        Private ContainerIdField As String
-        
-        Private DocumentIdField As Long
-        
-        Private FileNameField As String
-        
-        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
-        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
-            Get
-                Return Me.extensionDataField
-            End Get
-            Set
-                Me.extensionDataField = value
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property ContainerId() As String
-            Get
-                Return Me.ContainerIdField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.ContainerIdField, value) <> true) Then
-                    Me.ContainerIdField = value
-                    Me.RaisePropertyChanged("ContainerId")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property DocumentId() As Long
-            Get
-                Return Me.DocumentIdField
-            End Get
-            Set
-                If (Me.DocumentIdField.Equals(value) <> true) Then
-                    Me.DocumentIdField = value
-                    Me.RaisePropertyChanged("DocumentId")
-                End If
-            End Set
-        End Property
-        
-        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property FileName() As String
-            Get
-                Return Me.FileNameField
-            End Get
-            Set
-                If (Object.ReferenceEquals(Me.FileNameField, value) <> true) Then
-                    Me.FileNameField = value
-                    Me.RaisePropertyChanged("FileName")
-                End If
-            End Set
-        End Property
-        
-        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
-        
-        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
-            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
-            If (Not (propertyChanged) Is Nothing) Then
-                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
-            End If
-        End Sub
-    End Class
-    
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
-     System.ServiceModel.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.IDBService", ConfigurationName:="IDBServiceReference.IIDBService")>  _
-    Public Interface IIDBService
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
-        Function Heartbeat() As Boolean
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
-        Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
-        Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
-        Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
-        Sub CloseDatabaseRequest()
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
-        Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
-        Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatable", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnDatatableResponse")>  _
-        Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
-        Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalar", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ReturnScalarResponse")>  _
-        Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQuery", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ExecuteNonQueryResponse")>  _
-        Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
-        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileResponse")>  _
-        Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
-        Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/UpdateFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/UpdateFileResponse")>  _
-        Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
-        Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetFileResponse")>  _
-        Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
-        Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/DeleteFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/DeleteFileResponse")>  _
-        Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
-        Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/ImportFile", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/ImportFileResponse")>  _
-        Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
-            "e")>  _
-        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByDocumentIdRespons"& _ 
-            "e")>  _
-        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
-            "se")>  _
-        Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/GetDocumentByContainerIdRespon"& _ 
-            "se")>  _
-        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult)
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
-        Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult
-        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndex", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/NewFileIndexResponse")>  _
-        Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult)
-    End Interface
-    
-    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
-    Public Interface IIDBServiceChannel
-        Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel
-    End Interface
-    
-    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
-     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
-    Partial Public Class IDBServiceClient
-        Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService)
-        Implements IDBServiceReference.IIDBService
-        
-        Public Sub New()
-            MyBase.New
-        End Sub
-        
-        Public Sub New(ByVal endpointConfigurationName As String)
-            MyBase.New(endpointConfigurationName)
-        End Sub
-        
-        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As String)
-            MyBase.New(endpointConfigurationName, remoteAddress)
-        End Sub
-        
-        Public Sub New(ByVal endpointConfigurationName As String, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
-            MyBase.New(endpointConfigurationName, remoteAddress)
-        End Sub
-        
-        Public Sub New(ByVal binding As System.ServiceModel.Channels.Binding, ByVal remoteAddress As System.ServiceModel.EndpointAddress)
-            MyBase.New(binding, remoteAddress)
-        End Sub
-        
-        Public Function Heartbeat() As Boolean Implements IDBServiceReference.IIDBService.Heartbeat
-            Return MyBase.Channel.Heartbeat
-        End Function
-        
-        Public Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.HeartbeatAsync
-            Return MyBase.Channel.HeartbeatAsync
-        End Function
-        
-        Public Function CreateDatabaseRequest(ByVal Name As String, ByVal Debug As Boolean) As String Implements IDBServiceReference.IIDBService.CreateDatabaseRequest
-            Return MyBase.Channel.CreateDatabaseRequest(Name, Debug)
-        End Function
-        
-        Public Function CreateDatabaseRequestAsync(ByVal Name As String, ByVal Debug As Boolean) As System.Threading.Tasks.Task(Of String) Implements IDBServiceReference.IIDBService.CreateDatabaseRequestAsync
-            Return MyBase.Channel.CreateDatabaseRequestAsync(Name, Debug)
-        End Function
-        
-        Public Sub CloseDatabaseRequest() Implements IDBServiceReference.IIDBService.CloseDatabaseRequest
-            MyBase.Channel.CloseDatabaseRequest
-        End Sub
-        
-        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync
-            Return MyBase.Channel.CloseDatabaseRequestAsync
-        End Function
-        
-        Public Function ReturnDatatable(ByVal SQL As String) As IDBServiceReference.TableResult Implements IDBServiceReference.IIDBService.ReturnDatatable
-            Return MyBase.Channel.ReturnDatatable(SQL)
-        End Function
-        
-        Public Function ReturnDatatableAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.TableResult) Implements IDBServiceReference.IIDBService.ReturnDatatableAsync
-            Return MyBase.Channel.ReturnDatatableAsync(SQL)
-        End Function
-        
-        Public Function ReturnScalar(ByVal SQL As String) As IDBServiceReference.ScalarResult Implements IDBServiceReference.IIDBService.ReturnScalar
-            Return MyBase.Channel.ReturnScalar(SQL)
-        End Function
-        
-        Public Function ReturnScalarAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.ScalarResult) Implements IDBServiceReference.IIDBService.ReturnScalarAsync
-            Return MyBase.Channel.ReturnScalarAsync(SQL)
-        End Function
-        
-        Public Function ExecuteNonQuery(ByVal SQL As String) As IDBServiceReference.NonQueryResult Implements IDBServiceReference.IIDBService.ExecuteNonQuery
-            Return MyBase.Channel.ExecuteNonQuery(SQL)
-        End Function
-        
-        Public Function ExecuteNonQueryAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of IDBServiceReference.NonQueryResult) Implements IDBServiceReference.IIDBService.ExecuteNonQueryAsync
-            Return MyBase.Channel.ExecuteNonQueryAsync(SQL)
-        End Function
-        
-        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.NewFile
-            Return MyBase.Channel.NewFile(FileName, Contents)
-        End Function
-        
-        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.NewFileAsync
-            Return MyBase.Channel.NewFileAsync(FileName, Contents)
-        End Function
-        
-        Public Function UpdateFile(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.UpdateFile
-            Return MyBase.Channel.UpdateFile(DocObject, Contents)
-        End Function
-        
-        Public Function UpdateFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.UpdateFileAsync
-            Return MyBase.Channel.UpdateFileAsync(DocObject, Contents)
-        End Function
-        
-        Public Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetFile
-            Return MyBase.Channel.GetFile(DocObject)
-        End Function
-        
-        Public Function GetFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetFileAsync
-            Return MyBase.Channel.GetFileAsync(DocObject)
-        End Function
-        
-        Public Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean Implements IDBServiceReference.IIDBService.DeleteFile
-            Return MyBase.Channel.DeleteFile(DocObject)
-        End Function
-        
-        Public Function DeleteFileAsync(ByVal DocObject As IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.DeleteFileAsync
-            Return MyBase.Channel.DeleteFileAsync(DocObject)
-        End Function
-        
-        Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As IDBServiceReference.DocumentResult2 Implements IDBServiceReference.IIDBService.ImportFile
-            Return MyBase.Channel.ImportFile(FileInfo, Contents, [ReadOnly], RetentionTime)
-        End Function
-        
-        Public Function ImportFileAsync(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult2) Implements IDBServiceReference.IIDBService.ImportFileAsync
-            Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime)
-        End Function
-        
-        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByDocumentId
-            Return MyBase.Channel.GetDocumentByDocumentId(DocumentId)
-        End Function
-        
-        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByDocumentIdAsync
-            Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId)
-        End Function
-        
-        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByContainerId
-            Return MyBase.Channel.GetDocumentByContainerId(ContainerId)
-        End Function
-        
-        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.GetDocumentByContainerIdAsync
-            Return MyBase.Channel.GetDocumentByContainerIdAsync(ContainerId)
-        End Function
-        
-        Public Function NewFileIndex(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As IDBServiceReference.IndexResult Implements IDBServiceReference.IIDBService.NewFileIndex
-            Return MyBase.Channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value)
-        End Function
-        
-        Public Function NewFileIndexAsync(ByVal DocObject As IDBServiceReference.DocumentObject, ByVal Syskey As String, ByVal LanguageCode As String, ByVal Value As String) As System.Threading.Tasks.Task(Of IDBServiceReference.IndexResult) Implements IDBServiceReference.IIDBService.NewFileIndexAsync
-            Return MyBase.Channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value)
-        End Function
-    End Class
-End Namespace
--- a/Services/IDBServiceReference/System.IO.xsd
+++ b/Services/IDBServiceReference/System.IO.xsd
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.datacontract.org/2004/07/System.IO" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System.IO" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-  <xs:complexType name="FileInfo">
-    <xs:complexContent mixed="false">
-      <xs:extension base="tns:FileSystemInfo" />
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:element name="FileInfo" nillable="true" type="tns:FileInfo" />
-  <xs:complexType name="FileSystemInfo">
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##local" processContents="skip" />
-    </xs:sequence>
-    <xs:attribute ref="ser:FactoryType" />
-  </xs:complexType>
-  <xs:element name="FileSystemInfo" nillable="true" type="tns:FileSystemInfo" />
-</xs:schema>
--- a/Services/IDBServiceReference/configuration.svcinfo
+++ b/Services/IDBServiceReference/configuration.svcinfo
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
-  <behaviors />
-  <bindings>
-    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;tcpBinding&quot;&gt;&lt;security&gt;&lt;transport sslProtocols=&quot;None&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="tcpBinding" />
-  </bindings>
-  <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://localhost:9000/DigitalData/Services/Main&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;tcpBinding&quot; contract=&quot;IDBServiceReference.IIDBService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="IDBServiceReference.IIDBService" name="tcpBinding" />
-  </endpoints>
-</configurationSnapshot>
--- a/Modules.EDMIAPI/Constants.vb
+++ b/Modules.EDMIAPI/Constants.vb
@@ -1,8 +0,0 @@
-Public Class Constants
-    Public Const MAX_RECEIVED_MESSAGE_SIZE = 2147483647
-    Public Const MAX_BUFFER_SIZE = 2147483647
-    Public Const MAX_BUFFER_POOL_SIZE = 2147483647
-    Public Const MAX_CONNECTIONS = 10000
-    Public Const MAX_ARRAY_LENGTH = 2147483647
-    Public Const MAX_STRING_CONTENT_LENGTH = 2147483647
-End Class
--- a/Modules.EDMIAPI/Document.vb
+++ b/Modules.EDMIAPI/Document.vb
@@ -1,183 +0,0 @@
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
-Imports System.ServiceModel
-Imports System.IO
-
-Public Class Document
-    Private _logger As Logger
-    Private _logConfig As LogConfig
-    Private _channelFactory As ChannelFactory(Of IIDBServiceChannel)
-    Private _channel As IIDBServiceChannel
-
-    ''' <summary>
-    ''' Creates a new EDMIAPI object
-    ''' </summary>
-    ''' <param name="LogConfig">LogConfig object</param>
-    ''' <param name="ServiceAdress">The full service url to connect to</param>
-    Public Sub New(LogConfig As LogConfig, ServiceAdress As String)
-        _logger = LogConfig.GetLogger()
-        _logConfig = LogConfig
-
-        Try
-            Dim oBinding = Channel.GetBinding()
-            Dim oAddress = New EndpointAddress(ServiceAdress)
-            Dim oFactory = New ChannelFactory(Of IIDBServiceChannel)(oBinding, oAddress)
-
-            _channelFactory = oFactory
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
-    ''' <summary>
-    ''' Connect to the service
-    ''' </summary>
-    ''' <returns>True if connection was successful, false otherwise</returns>
-    Public Function Connect() As Boolean
-        Try
-            _channel = GetChannel()
-
-            _logger.Debug("Opening channel..")
-            _channel.Open()
-
-            _logger.Info("Connection to Service established!")
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    ''' <summary>
-    ''' Imports a file by filename
-    ''' </summary>
-    ''' <param name="FilePath">The filename to import</param>
-    ''' <returns>A document object</returns>
-    Public Function ImportFile(FilePath As String) As DocumentResult
-        Try
-            Dim oContents As Byte() = File.ReadAllBytes(FilePath)
-            Dim oInfo As New FileInfo(FilePath)
-            Dim oName As String = oInfo.Name
-            Dim oExtension As String = oInfo.Extension.Substring(1)
-
-            Dim oDocObject = _channel.NewFile(oName, oContents)
-            Return oDocObject
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    ''' <summary>
-    ''' Imports a file by filename
-    ''' </summary>
-    ''' <param name="FilePath">The filename to import</param>
-    ''' <returns>A document object</returns>
-    Public Async Function ImportFile2(FilePath As String, Optional [ReadOnly] As Boolean = False, Optional RetentionPeriod As Integer = -1) As Task(Of DocumentResult2)
-        Try
-            Dim oContents As Byte() = File.ReadAllBytes(FilePath)
-            Dim oInfo As New FileInfo(FilePath)
-            Dim oName As String = oInfo.Name
-            Dim oExtension As String = oInfo.Extension.Substring(1)
-
-            Dim oResult = Await _channel.ImportFileAsync(oInfo, oContents, [ReadOnly], RetentionPeriod)
-            Return oResult
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    ''' <summary>
-    ''' Imports a file by filename
-    ''' </summary>
-    ''' <param name="FilePath">The filename to import</param>
-    ''' <returns>A document object</returns>
-    Public Async Function ImportFileAsync(FilePath As String) As Task(Of DocumentResult)
-        Try
-            Dim oContents As Byte() = File.ReadAllBytes(FilePath)
-            Dim oInfo As New FileInfo(FilePath)
-            Dim oName As String = oInfo.Name
-            Dim oExtension As String = oInfo.Extension.Substring(1)
-
-            Dim oDocObject = Await _channel.NewFileAsync(oName, oContents)
-            Return oDocObject
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    Public Async Function NewFileIndexAsync(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As Task(Of IndexResult)
-        Try
-            Dim oResult As IndexResult = Await _channel.NewFileIndexAsync(DocObject, Syskey, LanguageCode, Value)
-
-            Return oResult
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult
-        Try
-            Dim oResult As IndexResult = _channel.NewFileIndex(DocObject, Syskey, LanguageCode, Value)
-
-            Return oResult
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    Public Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
-        Try
-            Return _channel.GetDocumentByDocumentId(DocumentId)
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
-        Try
-            Return _channel.GetDocumentByContainerId(ContainerId)
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-
-    ''' <summary>
-    ''' Aborts the channel and creates a new connection
-    ''' </summary>
-    Private Sub Reconnect()
-        _logger.Warn("Connection faulted. Trying to reconnect..")
-
-        Try
-            _channel.Abort()
-            _channel = GetChannel()
-            _channel.Open()
-        Catch ex As Exception
-            _logger.Error(ex)
-        End Try
-    End Sub
-
-    ''' <summary>
-    ''' Creates a channel and adds a Faulted-Handler
-    ''' </summary>
-    ''' <returns>A channel object</returns>
-    Private Function GetChannel() As IIDBServiceChannel
-        Try
-            _logger.Debug("Creating channel..")
-            Dim oChannel = _channelFactory.CreateChannel()
-
-            AddHandler oChannel.Faulted, AddressOf Reconnect
-
-            Return oChannel
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-End Class
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@@ -4,7 +4,7 @@
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5B1171DC-FFFE-4813-A20D-786AAE47B320}</ProjectGuid>
+    <ProjectGuid>{25017513-0D97-49D3-98D7-BA76D9B251B0}</ProjectGuid>
    <OutputType>Library</OutputType>
    <RootNamespace>DigitalData.Modules.EDMI.API</RootNamespace>
    <AssemblyName>DigitalData.Modules.EDMI.API</AssemblyName>
@@ -72,14 +72,13 @@
    <Import Include="System.Threading.Tasks" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Channel.vb" />
-    <Compile Include="Connected Services\IDBServiceReference\Reference.vb">
+    <Compile Include="Client\Channel.vb" />
+    <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.svcmap</DependentUpon>
    </Compile>
-    <Compile Include="Constants.vb" />
-    <Compile Include="Document.vb" />
+    <Compile Include="Client.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -106,51 +105,58 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult2.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.IndexResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResultOld.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.NonQueryResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.ScalarResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.IndexResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.EDMI.API.IDBServiceReference.TableResult.datasource">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.Filesystem.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.Filesystem.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService.wsdl" />
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Services.IDBService1.xsd">
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService1.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\service.wsdl" />
-    <None Include="Connected Services\IDBServiceReference\service.xsd">
+    <None Include="Connected Services\EDMIServiceReference\Message.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.Data.xsd">
+    <None Include="Connected Services\EDMIServiceReference\service.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\service.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.IO.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.Data.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.xsd">
      <SubType>Designer</SubType>
    </None>
    <None Include="My Project\Application.myapp">
      <Generator>MyApplicationCodeGenerator</Generator>
      <LastGenOutput>Application.Designer.vb</LastGenOutput>
    </None>
+    <None Include="My Project\DataSources\System.Data.DataTable.datasource" />
    <None Include="My Project\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <CustomToolNamespace>My</CustomToolNamespace>
@@ -168,16 +174,16 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <WCFMetadataStorage Include="Connected Services\IDBServiceReference\" />
+    <WCFMetadataStorage Include="Connected Services\EDMIServiceReference\" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\configuration91.svcinfo" />
+    <None Include="Connected Services\EDMIServiceReference\configuration91.svcinfo" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\configuration.svcinfo" />
+    <None Include="Connected Services\EDMIServiceReference\configuration.svcinfo" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="Connected Services\IDBServiceReference\Reference.svcmap">
+    <None Include="Connected Services\EDMIServiceReference\Reference.svcmap">
      <Generator>WCF Proxy Generator</Generator>
      <LastGenOutput>Reference.vb</LastGenOutput>
    </None>
--- a/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource
+++ b/Services/IDBServiceReference/DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult.datasource
@@ -5,6 +5,6 @@
    Renaming the file extension or editing the content of this file may   
    cause the file to be unrecognizable by the program.
 -->
-<GenericObjectDataSource DisplayName="DocumentResult" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.IDBServiceReference.DocumentResult</TypeInfo>
+<GenericObjectDataSource DisplayName="DataTable" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</TypeInfo>
 </GenericObjectDataSource>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -62,11 +62,11 @@ Namespace My
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMIAPI.My.MySettings
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
+        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.EDMI.API.My.MySettings
            Get
-                Return Global.DigitalData.Modules.EDMIAPI.My.MySettings.Default
+                Return Global.DigitalData.Modules.EDMI.API.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/Modules.EDMIAPI/app.config
+++ b/Modules.EDMIAPI/app.config
@@ -25,7 +25,7 @@
    <system.serviceModel>
        <bindings>
            <netTcpBinding>
-                <binding name="tcpBinding">
+                <binding name="tcpBinding" transferMode="Streamed">
                    <security>
                        <transport sslProtocols="None" />
                    </security>
@@ -35,9 +35,9 @@
        <client>
            <endpoint address="net.tcp://localhost:9000/DigitalData/Services/Main"
                binding="netTcpBinding" bindingConfiguration="tcpBinding"
-                contract="IDBServiceReference.IIDBService" name="tcpBinding">
+                contract="EDMIServiceReference.IEDMIService" name="tcpBinding">
                <identity>
-                    <dns value="localhost" />
+                    <servicePrincipalName value="host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works" />
                </identity>
            </endpoint>
        </client>
--- a/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
+++ b/Modules.Interfaces/ActiveDirectoryInterface/SyncUsers.MSSQL.vb
@@ -20,6 +20,8 @@ Namespace SyncUsers
        Public Function SyncUsers(GroupName As String, Users As List(Of ADUser), PropertyMapping As List(Of AttributeMapping)) As List(Of ADUser) Implements ISyncUsers.SyncUsers
            Dim oGroupId As Integer
            Dim oSyncedUsers As New List(Of ADUser)
+            Dim oSyncedUserIds As New List(Of Int64)
+
            Dim oCreatedUsers As New List(Of ADUser)
            Dim oUpdatedUsers As New List(Of ADUser)

@@ -40,7 +42,7 @@ Namespace SyncUsers

            For Each oUser In Users
                Dim oUserId As Int64
-                Dim oUserExists As Boolean = False
+                Dim oUserExists As Boolean

                ' Check if user already exists
                Try
@@ -54,6 +56,11 @@ Namespace SyncUsers
                    Continue For
                End Try

+                ' Collect user ids from existing users
+                If oUserExists Then
+                    oSyncedUserIds.Add(oUserId)
+                End If
+
                ' Create or update user
                Try
                    If Not oUserExists Then
@@ -99,8 +106,14 @@ Namespace SyncUsers
                oSyncedUsers.Add(oUser)
            Next

+            ' Delete users that are assigned to the group but no longer exist in active directory
+            Dim oUserIdString = String.Join(",", oSyncedUserIds)
+            Dim oSQL As String = $"DELETE FROM TBDD_GROUPS_USER WHERE USER_ID NOT IN (${oUserIdString}) AND GROUP_ID = {oGroupId}"
+            Dim oDeletedRelations = _mssql.GetScalarValue(oSQL)
+
            _logger.Info("Created [{0}] new users", oCreatedUsers.Count)
            _logger.Info("Updated [{0}] users", oUpdatedUsers.Count)
+            _logger.Info("Removed [{0}] users from Group [{1}]", oDeletedRelations, GroupName)

            Return oSyncedUsers
        End Function
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.0.1.0")>
+<Assembly: AssemblyVersion("1.1.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Interfaces/ZUGFeRDInterface.vb
+++ b/Modules.Interfaces/ZUGFeRDInterface.vb
@@ -11,7 +11,7 @@ Public Class ZUGFeRDInterface
    Private _logConfig As LogConfig
    Private _logger As Logger

-    Private Const ZUGFERD_CONVERTER_EXE = "ZUGFeRDInterface\pdf_zugferd_lib\pdf_zugferd_test.exe"
+    Private Const ZUGFERD_CONVERTER_EXE = "ZUGFeRDInterface\pdf_zugferd_test.exe" 'ZUGFeRDInterface\pdf_zugferd_lib\pdf_zugferd_test.exe
    Private Const ZUGFERD_CONVERTER_SUCCESS_MESSAGE = "Document contains ZUGFeRD data."

    Public Enum ErrorType
@@ -141,6 +141,10 @@ Public Class ZUGFeRDInterface
        Try
            Dim oResults = oAttachmentExtractor.Extract(Path, oAllowedExtensions)
            Return HandleAttachments(oResults)
+        Catch ex As ZUGFeRDExecption
+            ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code.
+            ' It also produces misleading error messages when checking if an attachment is a zugferd file.
+            Throw ex
        Catch ex As Exception
            _logger.Error(ex)
            Throw ex
@@ -178,6 +182,10 @@ Public Class ZUGFeRDInterface
            End Using

            Return oXmlDocument
+        Catch ex As ZUGFeRDExecption
+            ' Don't log ZUGFeRD Exceptions here, they should be handled by the calling code.
+            ' It also produces misleading error messages when checking if an attachment is a zugferd file.
+            Throw ex
        Catch ex As Exception
            _logger.Error(ex)
            Throw ex
--- a/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb
+++ b/Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb
@@ -48,14 +48,14 @@ Public Class PropertyValues
            ToLookup(Function(Item) Item.Value.GroupScope, ' Lookup key is group scope
                     Function(Item) Item)

-        _logger.Debug("Found {0} properties grouped in {1} group(s)", PropertyMap.Count - oDefaultProperties.Count, oGroupedProperties.Count)
+        _logger.Debug($"Found [{PropertyMap.Count - oDefaultProperties.Count}] properties grouped in [{oGroupedProperties.Count}] group(s)")
        ' Iterate through groups to get group scope and group items
        For Each oGroup In oGroupedProperties
            Dim oGroupScope As String = oGroup.Key
            Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object))
            Dim oRowCount = 0

-            _logger.Debug("Fetching Property values for group {0}.", oGroupScope)
+            _logger.Debug($"Fetching Property values for group [{oGroupScope}].")

            ' get properties as a nested object, see `oPropertyList`
            For Each oProperty As KeyValuePair(Of String, XmlItemProperty) In oGroup
@@ -94,24 +94,26 @@ Public Class PropertyValues
                    Dim oTableName As String = oColumn.Key.TableName
                    Dim oPropertyDescription As String = oColumn.Key.Description
                    Dim oRowCounter = oRowIndex + oGlobalGroupCounter + 1
+                    If IsNothing(oRowCounter) Then

+                    End If
                    ' Returns nothing if oColumn.Value contains an empty list
                    Dim oPropertyValue = oColumn.Value.ElementAtOrDefault(oRowIndex)

-                    _logger.Debug("Processing property {0}.", oPropertyDescription)
+                    _logger.Debug("Processing property [{0}].", oPropertyDescription)

                    If IsNothing(oPropertyValue) OrElse String.IsNullOrEmpty(oPropertyValue) Then
                        If oColumn.Key.IsRequired Then
-                            _logger.Warn("Property [{0}] is empty or not found but is required. Continuing with Empty String.", oPropertyDescription)
+                            _logger.Warn($"Property [{oPropertyDescription}] is empty or not found but is required. Continuing with Empty String.")
                            oResult.MissingProperties.Add(oPropertyDescription)
                        Else
-                            _logger.Debug("Property [{0}] is empty or not found. Continuing with Empty String.", oPropertyDescription)
+                            _logger.Debug($"Property [{oPropertyDescription}] is empty or not found. Continuing with Empty String.")
                        End If

                        oPropertyValue = String.Empty
                    End If

-                    _logger.Debug("Property {0} has value '{1}'", oPropertyDescription, oPropertyValue)
+                    _logger.Debug("Property [{0}] has value '{1}'", oPropertyDescription, oPropertyValue)

                    oResult.ValidProperties.Add(New ValidProperty() With {
                        .MessageId = MessageId,
--- a/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb
+++ b/Modules.Jobs/EDMI/ZUGFeRD/EmailFunctions.vb
@@ -62,7 +62,7 @@ Public Class EmailFunctions
            _logger.Error(ex)
        End Try
    End Sub
-    Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String)
+    Public Sub AddToEmailQueueMSSQL(MessageId As String, BodyText As String, pEmailData As EmailData, SourceProcedure As String, pEmailAccountId As Integer)
        If pEmailData Is Nothing Then
            _logger.Warn("EmailData is empty. Email will not be sent!")
            Exit Sub
@@ -73,7 +73,6 @@ Public Class EmailFunctions
            Dim oReference = MessageId
            Dim oEmailTo = ""
            Dim oSubject = EmailStrings.EMAIL_SUBJECT
-            Dim oAccountId = 1
            Dim oCreatedWho = "ZUGFeRD Service"
            Dim oFinalBodyText = String.Format(EmailStrings.EMAIL_WRAPPING_TEXT, BodyText)

@@ -119,7 +118,7 @@ Public Class EmailFunctions
                        ,EMAIL_ATTMT1)
                 VALUES
                       (77
-                       ,{oAccountId}
+                       ,{pEmailAccountId}
                       ,{oHistoryID}
                       ,'{MessageId}'
                       ,77
--- a/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Modules.Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -34,15 +34,18 @@ Public Class ImportZUGFeRDFiles
    Private ReadOnly _zugferd As ZUGFeRDInterface
    Private ReadOnly _firebird As Firebird
    Private ReadOnly _filesystem As Filesystem.File
+    Private ReadOnly _EmailOutAccountId As Integer
    Private ReadOnly _mssql As MSSQLServer
    Private ReadOnly _email As EmailFunctions

-    Public Sub New(LogConfig As LogConfig, Firebird As Firebird, Optional MSSQL As MSSQLServer = Nothing)
+
+    Public Sub New(LogConfig As LogConfig, Firebird As Firebird, pEmailOutAccount As Integer, Optional MSSQL As MSSQLServer = Nothing)
        _logConfig = LogConfig
        _logger = LogConfig.GetLogger()
        _firebird = Firebird
        _filesystem = New Filesystem.File(_logConfig)
        _mssql = MSSQL
+        _EmailOutAccountId = pEmailOutAccount
        _email = New EmailFunctions(LogConfig, _mssql, _firebird)

        _logger.Debug("Registering GDPicture License")
@@ -178,7 +181,7 @@ Public Class ImportZUGFeRDFiles
                                _logger.Info("Start processing file {0}", oFile.Name)

                                Try
-                                    oDocument = _zugferd.ExtractZUGFeRDFile(oFile.FullName)
+                                    oDocument = _zugferd.ExtractZUGFeRDFileWithGDPicture(oFile.FullName)
                                Catch ex As ZUGFeRDExecption
                                    Select Case ex.ErrorType
                                        Case ZUGFeRDInterface.ErrorType.NoZugferd
@@ -417,23 +420,23 @@ Public Class ImportZUGFeRDFiles
                                End If

                                For Each oProperty In oCheckResult.ValidProperties
-                                    Dim oGroupCounterValue = Nothing
+                                    Dim oGroupCounterValue = oProperty.GroupCounter

-                                    If oProperty.GroupCounter > -1 Then
-                                        oGroupCounterValue = oProperty.GroupCounter
+                                    ' If GroupCounter is -1, it means this is a default property that can only occur once.
+                                    ' Set the actual inserted value to 0
+                                    If oGroupCounterValue = -1 Then
+                                        oGroupCounterValue = 0
                                    End If

                                    Dim oCommand = $"INSERT INTO {oProperty.TableName} (REFERENCE_GUID, ITEM_DESCRIPTION, ITEM_VALUE, GROUP_COUNTER) VALUES ('{oMessageId}', '{oProperty.Description}', '{oProperty.Value}', {oGroupCounterValue})"
                                    _logger.Debug("Mapping Property [{0}]  to value [{1}] . Will be inserted into table {2}", oProperty.Description, oProperty.Value, oProperty.TableName)
-
                                    ' Insert into SQL Server
                                    If oArgs.InsertIntoSQLServer = True Then
                                        Dim oResult = _mssql.NewExecutenonQuery(oCommand)
                                        If oResult = False Then
-                                            _logger.Warn("SQL Command was not successful. Check the log.")
+                                            _logger.Warn($"SQL Command [{oCommand}] was not successful. Check the log.")
                                        End If
                                    End If
-
                                    ' Insert into Firebird
                                    _firebird.ExecuteNonQueryWithConnection(oCommand, oConnection, Firebird.TransactionMode.ExternalTransaction, oTransaction)
                                Next
@@ -467,7 +470,7 @@ Public Class ImportZUGFeRDFiles

                            Dim oBody = EmailStrings.EMAIL_MD5_ERROR
                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException")
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MD5HashException", _EmailOutAccountId)
                            AddRejectedState(oMessageId, "MD5HashException", "Die gesendete Rechnung wurde bereits verarbeitet!", "")
                        Catch ex As InvalidFerdException
                            _logger.Error(ex)
@@ -477,7 +480,7 @@ Public Class ImportZUGFeRDFiles
                            _firebird.ExecuteNonQuery(oSQL)
                            Dim oBody = EmailStrings.EMAIL_INVALID_DOCUMENT
                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException")
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "InvalidFerdException", _EmailOutAccountId)
                            AddRejectedState(oMessageId, "InvalidFerdException", "Inkorrekte Formate", "")
                        Catch ex As TooMuchFerdsException
                            _logger.Error(ex)
@@ -487,7 +490,7 @@ Public Class ImportZUGFeRDFiles
                            _firebird.ExecuteNonQuery(oSQL)
                            Dim oBody = EmailStrings.EMAIL_TOO_MUCH_FERDS
                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException")
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "TooMuchFerdsException", _EmailOutAccountId)
                            AddRejectedState(oMessageId, "TooMuchFerdsException", "Email enthielt mehr als ein ZUGFeRD-Dokument", "")
                        Catch ex As NoFerdsException
                            _logger.Error(ex)
@@ -497,7 +500,7 @@ Public Class ImportZUGFeRDFiles
                            _firebird.ExecuteNonQuery(oSQL)
                            Dim oBody = EmailStrings.EMAIL_NO_FERDS
                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException")
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "NoFerdsException", _EmailOutAccountId)
                            AddRejectedState(oMessageId, "NoFerdsException", " Email enthielt keine ZUGFeRD-Dokumente", "")
                        Catch ex As MissingValueException
                            _logger.Error(ex)
@@ -507,12 +510,12 @@ Public Class ImportZUGFeRDFiles
                            For Each prop In oMissingProperties
                                oMessage &= $"- {prop}"
                            Next
-                            Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - Missing Required Properties: {oMessage}' WHERE GUID = '{HISTORY_ID}'"
+                            Dim oSQL = $"UPDATE TBEDM_ZUGFERD_HISTORY_IN SET COMMENT = 'REJECTED - Missing Required Properties: [{oMessage}]' WHERE GUID = '{HISTORY_ID}'"
                            _firebird.ExecuteNonQuery(oSQL)

                            Dim oBody = CreateBodyForMissingProperties(ex.File.Name, oMissingProperties)
                            Dim oEmailData = MoveAndRenameEmailToRejected(oArgs, oMessageId)
-                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException")
+                            _email.AddToEmailQueueMSSQL(oMessageId, oBody, oEmailData, "MissingValueException", _EmailOutAccountId)
                            AddRejectedState(oMessageId, "MissingValueException", "Es fehlten ZugferdSpezifikationen", oMessage)

                        Catch ex As Exception
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 ' übernehmen, indem Sie "*" eingeben:

-<Assembly: AssemblyVersion("1.1.0.2")>
+<Assembly: AssemblyVersion("1.2.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Language/Utils.vb
+++ b/Modules.Language/Utils.vb
@@ -22,6 +22,11 @@ Public Class Utils
        Return [Enum].Parse(GetType(T), value)
    End Function

+    Public Shared Function ToBoolean(input As String) As Boolean
+        If String.IsNullOrEmpty(input) Then Return False
+        Return (input.Trim().ToLower() = "true") OrElse (input.Trim() = "1")
+    End Function
+
    ''' <summary>
    ''' Checks a value for three different `null` values,
    ''' Nothing, Empty String, DBNull
--- a/Modules.Logging.Test/ConstructorUnitTest.vb
+++ b/Modules.Logging.Test/ConstructorUnitTest.vb
@@ -8,19 +8,19 @@ Imports DigitalData.Modules.Logging
 ''' </summary>
 <TestClass()> Public Class ConstructorUnitTest
    Private Shared _currentDirectoryLogPath = Path.Combine(Directory.GetCurrentDirectory(), "Log")
-    Private Shared _appdataDirectoryLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Digital Data", "Modules.Logging")
+    Private Shared _appdataDirectoryLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Digital Data", "Modules.Logging", "Log")
    Private Shared _customDirectoryLogPath = Path.Combine(Directory.GetCurrentDirectory(), "CustomLogFolder")
    Private Shared _restrictedDirectoryLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "ShouldNotBeCreated")
    Private Shared _nonsenseDirectoryLogPath = "X:\FOO\BAR\BAZ\QUUX"

    <TestMethod()> Public Sub TestConstructorCurrentDirectory()
-        Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory)
-
-        Assert.AreEqual(_currentDirectoryLogPath, oLogConfig.LogDirectory)
+        Assert.ThrowsException(Of ArgumentException)(Sub()
+                                                         Dim oLogConfig As New LogConfig(LogConfig.PathType.Temp)
+                                                     End Sub)
    End Sub

    <TestMethod()> Public Sub TestConstructorApplicationDirectory()
-        Dim oLogConfig As New LogConfig(LogConfig.PathType.AppData)
+        Dim oLogConfig As New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Modules.Logging")

        Assert.AreEqual(_appdataDirectoryLogPath, oLogConfig.LogDirectory)
    End Sub
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -66,14 +66,12 @@ Public Class LogConfig
    Private Const ARCHIVE_EVERY As FileArchivePeriod = FileArchivePeriod.Day

    Private Const FILE_NAME_FORMAT_DEFAULT As String = "${shortdate}-${var:product}${var:suffix}.log"
-    Private Const FILE_NAME_FORMAT_DETAIL As String = "${shortdate}-${var:product}${var:suffix}-Detail.log"
    Private Const FILE_NAME_FORMAT_DEBUG As String = "${shortdate}-${var:product}${var:suffix}-Debug.log"
    Private Const FILE_NAME_FORMAT_ERROR As String = "${shortdate}-${var:product}${var:suffix}-Error.log"

    Private Const TARGET_DEFAULT As String = "defaultTarget"
    Private Const TARGET_ERROR_EX As String = "errorExceptionTarget"
    Private Const TARGET_ERROR As String = "errorTarget"
-    Private Const TARGET_DETAIL As String = "detailTarget"
    Private Const TARGET_DEBUG As String = "debugTarget"
    Private Const TARGET_MEMORY As String = "memoryTarget"

@@ -82,10 +80,11 @@ Public Class LogConfig

    Private Const LOG_FORMAT_BASE As String = DATE_FORMAT_DEFAULT & "|${logger:shortName=True}|${level:uppercase=true}"
    Private Const LOG_FORMAT_BASE_LONG_DATE As String = DATE_FORMAT_LONG & "|${logger:shortName=True}|${level:uppercase=true}"
+    Private Const LOG_FORMAT_CALLSITE As String = "${callsite:className=false:fileName=true:includeSourcePath=false:methodName=true}"

    Private Const LOG_FORMAT_DEFAULT As String = LOG_FORMAT_BASE & " >> ${message}"
    Private Const LOG_FORMAT_EXCEPTION As String = LOG_FORMAT_BASE & " >> ${exception:format=Message}${newline}${exception:format=StackTrace}"
-    Private Const LOG_FORMAT_DEBUG As String = LOG_FORMAT_BASE_LONG_DATE & " >> ${message}"
+    Private Const LOG_FORMAT_DEBUG As String = LOG_FORMAT_BASE_LONG_DATE & " >> " & LOG_FORMAT_CALLSITE & " -> ${message}"
    Private Const LOG_FORMAT_MEMORY As String = LOG_FORMAT_BASE_LONG_DATE & " >> ${message}${newline}${exception:format=Message}${newline}${exception:format=StackTrace}"

    Private Const FILE_NAME_ACCESS_TEST = "accessTest.txt"
@@ -102,6 +101,7 @@ Public Class LogConfig
        AppData = 0
        CurrentDirectory = 1
        CustomPath = 2
+        Temp = 3
    End Enum

    ''' <summary>
@@ -182,6 +182,8 @@ Public Class LogConfig
        If LogPath = PathType.AppData Then
            Dim appDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)
            basePath = Path.Combine(appDataDir, CompanyName, ProductName, FOLDER_NAME_LOG)
+        ElseIf LogPath = PathType.Temp Then
+            basePath = failSafePath
        Else 'Custom Path
            basePath = CustomLogPath
        End If
@@ -216,8 +218,14 @@ Public Class LogConfig
            logFileSuffix = $"-{Suffix}"
        End If

+        Dim oProductName As String = "Main"
+
+        If ProductName IsNot Nothing Then
+            oProductName = ProductName
+        End If
+
        ' Create config object and initalize it
-        config = GetConfig(ProductName, logFileSuffix)
+        config = GetConfig(oProductName, logFileSuffix)

        ' Save config
        LogFactory = New LogFactory With {
@@ -412,23 +420,11 @@ Public Class LogConfig
        Return errorLog
    End Function

-    Private Function GetDetailLogTarget(basePath As String) As FileTarget
-        Dim detailLog As New FileTarget() With {
-            .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_DETAIL),
-            .Name = TARGET_DETAIL,
-            .Layout = LOG_FORMAT_DEFAULT,
-            .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEBUG_DETAIL,
-            .ArchiveEvery = ARCHIVE_EVERY,
-            .KeepFileOpen = KEEP_FILES_OPEN
-        }
-
-        Return detailLog
-    End Function
    Private Function GetDebugLogTarget(basePath As String) As FileTarget
        Dim debugLog As New FileTarget() With {
            .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_DEBUG),
            .Name = TARGET_DEBUG,
-            .Layout = LOG_FORMAT_DEFAULT,
+            .Layout = LOG_FORMAT_DEBUG,
            .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEBUG_DETAIL,
            .ArchiveEvery = ARCHIVE_EVERY,
            .KeepFileOpen = KEEP_FILES_OPEN
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.0.0.0")>
+<Assembly: AssemblyVersion("2.0.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Messaging/Email.vb
+++ b/Modules.Messaging/Email.vb
@@ -261,6 +261,7 @@ Public Class Email
                                                      AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attachmentString As String = "", Optional Test As Boolean = False)
        Dim myClient As Net.Mail.SmtpClient
        Dim myMesssage As New MailMessage
+
        Try
            Dim oError As Boolean = False
            Dim oReceipiants As String()
@@ -361,7 +362,7 @@ Public Class Email

    End Function
    Public Function New_EmailISoft(ByVal mailSubject As String, ByVal mailBody As String, mailto As String,
-                                                     mailfrom As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
+                                                     from_mailaddress As String, from_name As String, mailsmtp As String, mailport As Integer, mailUser As String, mailPW As String,
                                                     AUTH_TYPE As String, SENDER_INSTANCE As String, Optional attment As String = "")
        Try
            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12
@@ -378,16 +379,17 @@ Public Class Email
            For Each _mailempfaenger As String In empfaenger
                _logger.Debug($"Working on email for {_mailempfaenger}..")
                Try
-                    Dim message As New Message()
-                    message.From = New Mailbox(mailfrom, mailfrom)
-                    message.[To].Add(New Mailbox(_mailempfaenger))
-                    message.Subject = mailSubject
+                    Dim oMessage As New Message()
+                    oMessage.From = New Mailbox(from_mailaddress, from_name)
+
+                    oMessage.[To].Add(New Mailbox(_mailempfaenger))
+                    oMessage.Subject = mailSubject
                    _logger.Debug($"Message created..")
                    Dim textBodyPart As New BodyPart()
                    textBodyPart.ContentType = New ContentType("text", "html", "utf-8")
                    textBodyPart.ContentTransferEncoding = ContentTransferEncoding.QuotedPrintable
                    textBodyPart.Body = mailBody
-                    message.BodyParts.Add(textBodyPart)
+                    oMessage.BodyParts.Add(textBodyPart)
                    If attment <> String.Empty Then
                        If System.IO.File.Exists(attment) Then
                            Dim attachment1 As New Independentsoft.Email.Mime.Attachment(attment)
@@ -398,7 +400,7 @@ Public Class Email
                            ElseIf attment.ToLower.EndsWith("docx") Then
                                attachment1.ContentType = New ContentType("application", "MS-word")
                            End If
-                            message.BodyParts.Add(attachment1)
+                            oMessage.BodyParts.Add(attachment1)
                        Else
                            _logger.Warn($"Attachment {attment.ToString} is not existing!")
                        End If
@@ -469,7 +471,7 @@ Public Class Email
                        End Try
                    End Try
                    Try
-                        client.Send(message)
+                        client.Send(oMessage)
                        _logger.Info("Message to " & _mailempfaenger & " has been send.")
                        _error = False
                    Catch ex As Exception
--- a/Modules.Windream/DDWindream.zip
+++ b/Modules.Windream/DDWindream.zip
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.0.0.2")>
+<Assembly: AssemblyVersion("1.0.0.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Windream/Windream.vb
+++ b/Modules.Windream/Windream.vb
@@ -66,7 +66,31 @@ Imports System.Text.RegularExpressions
 ''' This class should not be instanciated directly. Instead, ConnectionBuilder should be used.
 ''' </remarks>
 Public Class Windream
+#Region "+++++ Konstanten +++++"
+    Protected Const WMObjectEditModeObject = &H1F
+    Protected Const WMObjectStreamOpenModeReadWrite = 2
+    Protected Const WMEntityObjectType = 10
+    Protected Const WMEntityDocument = 1

+    Public Const WMObjectVariableValueTypeUndefined = 0
+    Public Const WMObjectVariableValueTypeString = 1
+    Public Const WMObjectVariableValueTypeInteger = 2
+    Public Const WMObjectVariableValueTypeFloat = 3
+    Public Const WMObjectVariableValueTypeBoolean = 4
+    Public Const WMObjectVariableValueTypeDate = 5
+    Public Const WMObjectVariableValueTypeFixedPoint = 6
+    Public Const WMObjectVariableValueTypeTimeStamp = 7
+    Public Const WMObjectVariableValueTypeCurrency = 8
+    Public Const WMObjectVariableValueTypeTime = 9
+    Public Const WMObjectVariableValueTypeVariant = 10
+    Public Const WMObjectVariableValueTypeMask = &HFFF
+    Public Const WMObjectVariableValueFlagMask = &HFFFFF000
+    Public Const WMObjectVariableValueTypeVector = &H1000
+    Public Const WMObjectVariableValueTypeFulltext = &H2000
+    Public Const WMObjectVariableValueTypeDefaultValue = &H4000
+
+    Public Const WMObjectEditModeIndexEdit = &H3DA
+#End Region
 #Region "Private Properties"
    Private ReadOnly _logger As Logger
    Private ReadOnly _logConfig As LogConfig
@@ -101,6 +125,8 @@ Public Class Windream
        End Get
    End Property

+
+
 #End Region
    ''' <summary>
    ''' Creates a new Windream object and connects to a server with the provided options and credentials
@@ -309,6 +335,7 @@ Public Class Windream
            Next

            ' Indexarray zurückgeben
+            oIndicies.Sort()
            'Return aIndexNames
            Return oIndicies

@@ -418,10 +445,14 @@ Public Class Windream
                .aServerName = ServerName
            }
        End If
+        If UserName IsNot Nothing Then
+            If UserName <> String.Empty Then
+                _logger.Info("Impersonated Login: {0}", oImpersonation)
+                _logger.Info("Username: {0}", IIf(UserName IsNot Nothing, UserName, Environment.UserName))
+                _logger.Info("Domain: {0}", IIf(Domain IsNot Nothing, Domain, Environment.UserDomainName))
+            End If
+        End If

-        _logger.Info("Impersonated Login: {0}", oImpersonation)
-        _logger.Info("Username: {0}", IIf(UserName IsNot Nothing, UserName, Environment.UserName))
-        _logger.Info("Domain: {0}", IIf(Domain IsNot Nothing, Domain, Environment.UserDomainName))

        Try
            oSession = oConnect.Login(oCredentials)
@@ -576,7 +607,7 @@ Public Class Windream
        End Try
    End Function

-    Public Function NewFolder(Path As String) As Boolean
+    Public Function NewFolder(Path As String, pExtension As String) As Boolean
        If Not TestSessionLoggedIn() Then
            Return False
        End If
@@ -589,10 +620,14 @@ Public Class Windream


            For Each oFolder In oFolders
+                If oFolder.ToString.EndsWith(pExtension) Then
+                    Exit For
+                End If
                oCurrentPath = Combine(oCurrentPath, oFolder)

                If TestFolderExists(oCurrentPath) = False Then
                    oFolderObject = Session.GetNewWMObjectFS(WMEntityFolder, oCurrentPath, WMObjectEditModeNoEdit)
+                    _logger.Info($"new Folder [{oCurrentPath}] has been created!")
                End If
            Next

@@ -728,20 +763,28 @@ Public Class Windream
        Dim oNormalizedPath = GetCleanedPath(Path)
        Try

-            If UsesDriveLetter Then
-                ' Remove Driveletter eg. W:\
-                If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
-                    oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter + 2)
-                End If
-            Else
-                If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
-                    ' Remove Windream Base Path eg. \\windream\objects\
-                    oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1)
-                End If
+            'If UsesDriveLetter Then
+            ' Remove Driveletter eg. W:\
+            If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
+                _logger.Debug($"Replacing ClientDriveLetter: [{ClientDriveLetter}]")
+                oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter.Length + 2)
            End If
+            'Else
+            If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
+                _logger.Debug($"Replacing ClientBasePath: [{ClientBasePath}]")
+                ' Remove Windream Base Path eg. \\windream\objects\
+                oNormalizedPath = oNormalizedPath.Substring(ClientBasePath.Length - 1)
+            End If
+            'End If

            oNormalizedPath = oNormalizedPath.Replace("\\", "\")
            _logger.Debug($"oNormalizedPath: [{oNormalizedPath}]")
+            If oNormalizedPath.Contains(":") Then
+                _logger.Info($"oNormalizedPath still contains a drive name!!")
+                _logger.Info($"Check Your config ClientDriveLetter [{ClientDriveLetter}] // ClientBasePath [{ClientBasePath}]")
+                oNormalizedPath = oNormalizedPath.Substring(3)
+                _logger.Debug($"oNormalizedPath after Substring: [{oNormalizedPath}]")
+            End If
            Return oNormalizedPath
        Catch ex As Exception
            _logger.Warn($"Unexpected error in GetNormalizedPath - oNormalizedPath [{oNormalizedPath}] - Error: [{ex.Message}]")
@@ -1009,8 +1052,8 @@ Public Class Windream
            Dim oWMObject As WMObject = GetFileByPath(Path)

            If oWMObject Is Nothing Then
-                _logger.Warn("Error RemoveFile (oWMObject is nothing)")
-                Return False
+                _logger.Debug("File so far not existing in WM")
+                Return True
            End If
            _logger.Info($"Deleting WMObject [{Path}]")
            oWMObject.Delete()
@@ -1104,6 +1147,7 @@ Public Class Windream
            Return True
        Catch ex As Exception
            _logger.Error(ex)
+            UnlockObject(oWMObject)
            Return False
        End Try
    End Function
@@ -1343,6 +1387,25 @@ Public Class Windream
            Return False
        End Try
    End Function
+    Public Function VersionWMFilename(pPath As String, pExt As String)
+        Dim rNewFilepath As String = pPath
+        pPath = GetNormalizedPath(pPath)
+        Dim oPath = pPath.Substring(0, pPath.LastIndexOf("\"))
+        Dim oFilename = pPath.Substring(pPath.LastIndexOf("\") + 1, pPath.Length - pPath.LastIndexOf("\") - 1)
+        Dim oCheck = oFilename
+        Dim oSplit As List(Of String) = oFilename.Split("~").ToList()
+        oFilename = oFilename.Replace(pExt, "")
+        Dim oCount As Integer = 2
+        Do While TestFileExists(rNewFilepath) = True
+            oFilename = oFilename.Replace(pExt, "")
+            Dim oVersion = "~" + (oCount - 1).ToString
+            oFilename = oFilename.Replace(oVersion, "")
+            oFilename = oFilename & "~" & oCount & pExt
+            oCount += 1
+            rNewFilepath = oPath + "\" + oFilename
+        Loop
+        Return rNewFilepath
+    End Function
    Public Function TestFolderExists(Path As String) As Boolean
        Return TestObjectExists(GetNormalizedPath(Path), WMEntityFolder)
    End Function
@@ -1400,6 +1463,7 @@ Public Class Windream
        End If

        If TestObjectExists(ObjectName, ObjectType) = False Then
+            _logger.Warn("GetObjectByName: Object {0} does not exist!", ObjectName)
            Return Nothing
        End If

@@ -1418,6 +1482,7 @@ Public Class Windream
        End If

        If TestObjectExists(ObjectName, ObjectType) = False Then
+            _logger.Warn("GetObjectByPath: Object {0} does not exist!", ObjectName)
            Return Nothing
        End If

--- a/Modules/Filesystem.Test/FileTest.vb
+++ b/Modules/Filesystem.Test/FileTest.vb
@@ -1,5 +1,6 @@
 Imports System.Text
 Imports Microsoft.VisualStudio.TestTools.UnitTesting
+Imports DigitalData.Modules.Logging

 <TestClass()> Public Class FileTest

@@ -8,7 +9,7 @@ Imports Microsoft.VisualStudio.TestTools.UnitTesting
    End Sub

    <TestMethod()> Public Sub TestMethod1()
-        Dim oLogConfig = New DigitalData.Modules.Logging.LogConfig(DigitalData.Modules.Logging.LogConfig.PathType.CurrentDirectory)
+        Dim oLogConfig = New DigitalData.Modules.Logging.LogConfig(LogConfig.PathType.Temp)
        Dim oFilesystem As New DigitalData.Modules.Filesystem.File(oLogConfig)

        Dim oPath = "E:\Test~2345676778697678678967867.txt"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jonathan Jenne	31ae07b3eb	EDMI: fix API.Client constructor	2020-04-28 14:51:24 +02:00
Jonathan Jenne	7f59e1d1ca	Version 2.0.1.0	2020-04-28 14:50:55 +02:00
Jonathan Jenne	874e8c893c	Logging: Show Method/Line Numbers for Debug Messages	2020-04-28 14:50:41 +02:00
Jonathan Jenne	7bf03b303b	EDMI: clean up service	2020-04-28 11:11:54 +02:00
Jonathan Jenne	ebc482b7b2	Windream: Log if object does not exist	2020-04-27 16:22:34 +02:00
Jonathan Jenne	29600e0a5e	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2020-04-27 14:17:12 +02:00
Jonathan Jenne	4cde711955	EDMI	2020-04-27 14:16:42 +02:00
Digital Data - Marlon Schreiber	f2273ceed7	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2020-04-27 14:16:41 +02:00
Digital Data - Marlon Schreiber	cbc603cbb7	MS WINDREAM MOdule	2020-04-27 14:16:32 +02:00
Jonathan Jenne	ed29e1b6a9	EDMI: Update Service and Client to Use Messages for EDMI Methods	2020-04-24 11:53:08 +02:00
Jonathan Jenne	d2717b9216	Language: Add ToBoolean, EMIBenchmark: try blocks	2020-04-22 14:34:22 +02:00
Jonathan Jenne	162485e3f0	EDMIBenchmark: add logging	2020-04-22 11:07:21 +02:00
Jonathan Jenne	99e7a36d84	Interfaces: Dont log ZUGFeRD Exceptions while validating, leads to misleading error messages	2020-04-22 10:47:09 +02:00
Jonathan Jenne	afe42e52c0	Version 0.0.7.1: dont try to create app startup path	2020-04-20 17:19:58 +02:00
Jonathan Jenne	4cb20bfb59	skip path test	2020-04-20 10:58:56 +02:00
Jonathan Jenne	409e4e375d	ZUGFeRD Service: Version 1.2.1.0	2020-04-20 10:58:40 +02:00
Jonathan Jenne	ed02436dd6	Jobs.EDMI.ZUGFeRD: Use GDPicture for Validation, Fix Group counter being nothing, remove xml from allowed extensions	2020-04-20 10:58:13 +02:00
Digital Data - Marlon Schreiber	45359d3cab	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2020-04-20 10:01:56 +02:00
Digital Data - Marlon Schreiber	79e1d0a7de	MS WISAG ZUGFERD	2020-04-20 10:01:46 +02:00
Jonathan Jenne	dc43397d55	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2020-04-17 11:57:32 +02:00
Jonathan Jenne	14194248ad	EDMI: Load Object Store Paths	2020-04-17 11:57:18 +02:00
Digital Data - Marlon Schreiber	fde2ca6198	Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo	2020-04-17 11:55:42 +02:00
Digital Data - Marlon Schreiber	1d88a8467c	MS EmailFunctions - ZuGferd Service - Windream	2020-04-17 11:55:33 +02:00
Jonathan Jenne	88dfb3fab1	EDMI: Prepare using moving files to archive and setting retention date on import	2020-04-16 16:31:34 +02:00
Jonathan Jenne	9095c0cd07	EDMI: Add Testing to EDMIBenchmark, Add ListFiles to EDMIService	2020-04-16 13:38:01 +02:00
Jonathan Jenne	6ee7bd07a3	EDMIBenchmark: Prepare further tests	2020-04-15 16:13:26 +02:00
Jonathan Jenne	b7a5f4d4a3	WIP: EDMI: Improve Error Handling	2020-04-15 14:44:42 +02:00
Jonathan Jenne	62e4e409a6	WIP: EDMI Service	2020-04-15 12:09:01 +02:00
Jonathan Jenne	a20c0eb4b0	WIP: Streaming files from service to client	2020-04-14 16:25:16 +02:00
Jonathan Jenne	52a6d103e6	EDMIService: fix paths on import	2020-04-14 10:34:30 +02:00
Jonathan Jenne	bb9dd66d1f	EDMI Service: WIP	2020-04-09 16:23:39 +02:00
Jonathan Jenne	7abf47c2fc	Modules.Interfaces: Version 1.0.2.0	2020-04-09 12:36:52 +02:00
Jonathan Jenne	b1f7883757	remove users from group on sync	2020-04-09 12:36:19 +02:00
Jonathan Jenne	84ebac00a9	test sync delete user	2020-04-09 12:23:45 +02:00
Jonathan Jenne	308fdef2f8	EDMIBenchmark: small changes	2020-04-08 15:02:03 +02:00
Jonathan Jenne	a7125add1e	DocumentViewer: Version 1.0.3.0	2020-04-08 15:01:45 +02:00
Jonathan Jenne	10e2579df4	DocumentViewer: Support Streams	2020-04-08 15:01:28 +02:00
Jonathan Jenne	594d71bc75	add FileId to DocumentObject	2020-04-08 14:14:50 +02:00
Jonathan Jenne	86c99f0fc6	set logEntireMessage to false to prevent outofmemory exception when importing multiple large files	2020-04-08 13:42:17 +02:00
Jonathan Jenne	b78949ae46	stupid wcf config	2020-04-08 11:41:47 +02:00
Jonathan Jenne	425d51c65c	create directory on import, version filename	2020-04-08 11:38:34 +02:00
Jonathan Jenne	a7e48a939c	add edmi benchmark	2020-04-08 11:37:51 +02:00
Jonathan Jenne	d1817fedb5	bring EDMIService up to date	2020-04-07 10:55:09 +02:00
Jonathan Jenne	37a3675d84	update Service Reference in EDMI.API	2020-04-07 10:54:35 +02:00
Jonathan Jenne	fa476e3101	Logging: Version 2.0.0.1	2020-04-07 10:44:43 +02:00
Jonathan Jenne	a394c5e557	set default product name if not supplied	2020-04-07 10:44:33 +02:00
Jonathan Jenne	b38e3acb6d	remove last IDB fragments	2020-04-06 16:27:33 +02:00
Jonathan Jenne	bd01dfe6d2	fix EDMI.File Test	2020-04-06 16:27:10 +02:00
Jonathan Jenne	eb527a7abb	EDMIService: Use EDMI.File functions, add DatastorePath	2020-04-06 16:04:01 +02:00
Jonathan Jenne	0e13de63fb	fix old references to IDBService	2020-04-06 15:21:02 +02:00
Jonathan Jenne	ec779f7697	Add new Temp option to Logging	2020-04-06 15:18:04 +02:00
Jonathan Jenne	1d62d18ced	fix Logging.Test	2020-04-06 15:17:54 +02:00
Jonathan Jenne	729f4c73ee	fix Filesystem.Test	2020-04-06 15:17:38 +02:00
Jonathan Jenne	77b6658988	add EDMI.File Module	2020-04-06 15:17:18 +02:00
Jonathan Jenne	7de03b4889	rename service directories	2020-04-06 15:17:03 +02:00
Jonathan Jenne	9a0235e941	fix remaining EDMI.API reference errors	2020-04-06 14:11:16 +02:00
Jonathan Jenne	018469dc21	clean up changes in EDMI.API	2020-04-06 14:02:46 +02:00
Jonathan Jenne	4809337c86	Merge remote-tracking branch 'origin/master' into ZugferdService-Redesign	2020-04-06 13:24:48 +02:00
Digital Data - Marlon Schreiber	dc82b42e7a	MS windream	2020-04-06 13:20:15 +02:00