bring EDMIService up to date

update Service Reference in EDMI.API
Logging: Version 2.0.0.1
2020-04-07 10:55:09 +02:00 · 2020-04-07 10:54:35 +02:00 · 2020-04-07 10:44:43 +02:00 · 2020-04-07 10:44:33 +02:00 · 2020-04-06 16:27:33 +02:00 · 2020-04-06 16:27:10 +02:00
151 changed files with 1464 additions and 1085 deletions
--- 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,25 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -150,10 +154,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 +162,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 +170,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 +238,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 +254,42 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -292,14 +304,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 +325,19 @@ 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}
 	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.GetActivePath("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,43 @@
+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 Const PATH_ACTIVE As String = "Active"
+    Public Const PATH_ARCHIVE As String = "Archive"
+    Public Const PATH_EDMI As String = "EDMI"
+
+    Public Sub New(LogConfig As LogConfig, DatastoreBasePath As String)
+        _LogConfig = LogConfig
+        _Logger = LogConfig.GetLogger()
+        _BasePath = DatastoreBasePath
+    End Sub
+
+    Public Function GetActivePath(DocumentType As String)
+        Dim oPathParts As New List(Of String) From {_BasePath, PATH_EDMI, PATH_ACTIVE, DocumentType}
+        oPathParts.AddRange(GetDatePath())
+
+        Return IO.Path.Combine(oPathParts.ToArray())
+    End Function
+
+    Public Function GetArchivePath(DocumentType As String)
+        Dim oPathParts As New List(Of String) From {_BasePath, PATH_EDMI, PATH_ARCHIVE, DocumentType}
+        oPathParts.AddRange(GetDatePath())
+
+        Return IO.Path.Combine(oPathParts.ToArray())
+    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.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/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult.datasource
@@ -6,5 +6,5 @@
    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>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult, 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.DocumentResult2.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2.datasource
@@ -6,5 +6,5 @@
    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>
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentResult2, 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,156 @@
+<?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.datacontract.org/2004/07/System.IO" />
+    </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="IEDMIService_ImportFile_InputMessage">
+    <wsdl:part name="parameters" element="tns:ImportFile" />
+  </wsdl:message>
+  <wsdl:message name="IEDMIService_ImportFile_OutputMessage">
+    <wsdl:part name="parameters" element="tns:ImportFileResponse" />
+  </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" message="tns:IEDMIService_ImportFile_InputMessage" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" message="tns:IEDMIService_ImportFile_OutputMessage" />
+    </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,6 +1,6 @@
 <?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:element name="Heartbeat">
@@ -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:DocumentResult" />
      </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:DocumentResult" />
      </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:DocumentResult" />
      </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:DocumentResult" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -181,7 +164,24 @@
  <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:DocumentResult" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ImportFile">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/System.IO" minOccurs="0" name="FileInfo" nillable="true" type="q12: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:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="ImportFileResult" nillable="true" type="q13:DocumentResult2" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
@@ -198,7 +198,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:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService" minOccurs="0" name="NewFileIndexResult" nillable="true" type="q15: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">
--- a/Services/EDMIServiceReference/Reference.svcmap
+++ b/Services/EDMIServiceReference/Reference.svcmap
@@ -22,11 +22,11 @@
    <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" />
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -14,18 +14,18 @@ Option Explicit On
 Imports System
 Imports System.Runtime.Serialization

-Namespace IDBServiceReference
+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.IDBService"),  _
+     System.Runtime.Serialization.DataContractAttribute(Name:="BaseResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     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))>  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ScalarResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2)),  _
+     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
@@ -87,21 +87,21 @@ Namespace IDBServiceReference
    
    <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.Runtime.Serialization.DataContractAttribute(Name:="ScalarResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     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(EDMIServiceReference.TableResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentResult2.DocumentObject)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.IndexResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
-     System.Runtime.Serialization.KnownTypeAttribute(GetType(IDBServiceReference.DocumentObject)),  _
+     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DocumentObject)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileInfo)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.IO.FileSystemInfo))>  _
    Partial Public Class ScalarResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private ScalarField As Object
@@ -122,22 +122,22 @@ Namespace IDBServiceReference
    
    <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.Runtime.Serialization.DataContractAttribute(Name:="NonQueryResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class NonQueryResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.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.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class DocumentResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        
        Private ContentsField() As Byte
        
-        Private DocumentField As IDBServiceReference.DocumentObject
+        Private DocumentField As EDMIServiceReference.DocumentObject
        
        Private HasContentsField As Boolean
        
@@ -155,7 +155,7 @@ Namespace IDBServiceReference
        End Property
        
        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentObject
+        Public Property Document() As EDMIServiceReference.DocumentObject
            Get
                Return Me.DocumentField
            End Get
@@ -183,14 +183,14 @@ Namespace IDBServiceReference
    
    <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.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class DocumentResult2
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        
        Private ContentsField() As Byte
        
-        Private DocumentField As IDBServiceReference.DocumentResult2.DocumentObject
+        Private DocumentField As EDMIServiceReference.DocumentResult2.DocumentObject
        
        Private HasContentsField As Boolean
        
@@ -208,7 +208,7 @@ Namespace IDBServiceReference
        End Property
        
        <System.Runtime.Serialization.DataMemberAttribute(IsRequired:=true)>  _
-        Public Property Document() As IDBServiceReference.DocumentResult2.DocumentObject
+        Public Property Document() As EDMIServiceReference.DocumentResult2.DocumentObject
            Get
                Return Me.DocumentField
            End Get
@@ -235,7 +235,7 @@ Namespace IDBServiceReference
        
        <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.Runtime.Serialization.DataContractAttribute(Name:="DocumentResult2.DocumentObject", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
         System.SerializableAttribute()>  _
        Partial Public Class DocumentObject
            Inherits Object
@@ -282,10 +282,10 @@ Namespace IDBServiceReference
    
    <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.Runtime.Serialization.DataContractAttribute(Name:="IndexResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class IndexResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        
        Private IndexIdField As Long
        
@@ -305,10 +305,10 @@ Namespace IDBServiceReference
    
    <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.Runtime.Serialization.DataContractAttribute(Name:="TableResult", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService"),  _
     System.SerializableAttribute()>  _
    Partial Public Class TableResult
-        Inherits IDBServiceReference.BaseResult
+        Inherits EDMIServiceReference.BaseResult
        
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private TableField As System.Data.DataTable
@@ -404,108 +404,112 @@ Namespace IDBServiceReference
    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.ServiceContractAttribute([Namespace]:="http://DigitalData.Services.EDMIService", ConfigurationName:="EDMIServiceReference.IEDMIService")>  _
+    Public Interface IEDMIService
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
+        <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.IDBService/IIDBService/Heartbeat", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/HeartbeatResponse")>  _
+        <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.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
+        <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.IDBService/IIDBService/CreateDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CreateDatabaseRequestResponse")>  _
+        <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.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
+        <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.IDBService/IIDBService/CloseDatabaseRequest", ReplyAction:="http://DigitalData.Services.IDBService/IIDBService/CloseDatabaseRequestResponse")>  _
+        <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.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.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.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.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.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.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.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.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.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.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.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.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.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.EDMIService/IEDMIService/NewFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileResponse")>  _
+        Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.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.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.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.EDMIService/IEDMIService/UpdateFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/UpdateFileResponse")>  _
+        Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.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.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.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.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
+        Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.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.EDMIService/IEDMIService/GetFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileResponse")>  _
+        Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.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.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.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.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.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.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
+            "nse")>  _
+        Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult
        
-        <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.EDMIService/IEDMIService/GetDocumentByDocumentId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByDocumentIdRespo"& _ 
+            "nse")>  _
+        Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult)
        
-        <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.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
+            "onse")>  _
+        Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.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.EDMIService/IEDMIService/GetDocumentByContainerId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetDocumentByContainerIdResp"& _ 
+            "onse")>  _
+        Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.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.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
+        Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2
        
-        <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.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/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 EDMIServiceReference.DocumentResult2)
        
-        <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.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.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)
+        <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.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")>  _
-    Public Interface IIDBServiceChannel
-        Inherits IDBServiceReference.IIDBService, System.ServiceModel.IClientChannel
+    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 IDBServiceClient
-        Inherits System.ServiceModel.ClientBase(Of IDBServiceReference.IIDBService)
-        Implements IDBServiceReference.IIDBService
+    Partial Public Class EDMIServiceClient
+        Inherits System.ServiceModel.ClientBase(Of EDMIServiceReference.IEDMIService)
+        Implements EDMIServiceReference.IEDMIService
        
        Public Sub New()
            MyBase.New
@@ -527,115 +531,115 @@ Namespace IDBServiceReference
            MyBase.New(binding, remoteAddress)
        End Sub
        
-        Public Function Heartbeat() As Boolean Implements IDBServiceReference.IIDBService.Heartbeat
+        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 IDBServiceReference.IIDBService.HeartbeatAsync
+        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 IDBServiceReference.IIDBService.CreateDatabaseRequest
+        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 IDBServiceReference.IIDBService.CreateDatabaseRequestAsync
+        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 IDBServiceReference.IIDBService.CloseDatabaseRequest
+        Public Sub CloseDatabaseRequest() Implements EDMIServiceReference.IEDMIService.CloseDatabaseRequest
            MyBase.Channel.CloseDatabaseRequest
        End Sub
        
-        Public Function CloseDatabaseRequestAsync() As System.Threading.Tasks.Task Implements IDBServiceReference.IIDBService.CloseDatabaseRequestAsync
+        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 IDBServiceReference.TableResult Implements IDBServiceReference.IIDBService.ReturnDatatable
+        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 IDBServiceReference.TableResult) Implements IDBServiceReference.IIDBService.ReturnDatatableAsync
+        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 IDBServiceReference.ScalarResult Implements IDBServiceReference.IIDBService.ReturnScalar
+        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 IDBServiceReference.ScalarResult) Implements IDBServiceReference.IIDBService.ReturnScalarAsync
+        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 IDBServiceReference.NonQueryResult Implements IDBServiceReference.IIDBService.ExecuteNonQuery
+        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 IDBServiceReference.NonQueryResult) Implements IDBServiceReference.IIDBService.ExecuteNonQueryAsync
+        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 IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.NewFile
+        Public Function NewFile(ByVal FileName As String, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult 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 IDBServiceReference.DocumentResult) Implements IDBServiceReference.IIDBService.NewFileAsync
+        Public Function NewFileAsync(ByVal FileName As String, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.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
+        Public Function UpdateFile(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.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
+        Public Function UpdateFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject, ByVal Contents() As Byte) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.UpdateFileAsync
            Return MyBase.Channel.UpdateFileAsync(DocObject, Contents)
        End Function
        
-        Public Function GetFile(ByVal DocObject As IDBServiceReference.DocumentObject) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetFile
+        Public Function GetFile(ByVal DocObject As EDMIServiceReference.DocumentObject) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.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
+        Public Function GetFileAsync(ByVal DocObject As EDMIServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetFileAsync
            Return MyBase.Channel.GetFileAsync(DocObject)
        End Function
        
-        Public Function DeleteFile(ByVal DocObject As IDBServiceReference.DocumentObject) As Boolean Implements IDBServiceReference.IIDBService.DeleteFile
+        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 IDBServiceReference.DocumentObject) As System.Threading.Tasks.Task(Of Boolean) Implements IDBServiceReference.IIDBService.DeleteFileAsync
+        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 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
+        Public Function GetDocumentByDocumentId(ByVal DocumentId As Long) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.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
+        Public Function GetDocumentByDocumentIdAsync(ByVal DocumentId As Long) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.GetDocumentByDocumentIdAsync
            Return MyBase.Channel.GetDocumentByDocumentIdAsync(DocumentId)
        End Function
        
-        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As IDBServiceReference.DocumentResult Implements IDBServiceReference.IIDBService.GetDocumentByContainerId
+        Public Function GetDocumentByContainerId(ByVal ContainerId As String) As EDMIServiceReference.DocumentResult Implements EDMIServiceReference.IEDMIService.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
+        Public Function GetDocumentByContainerIdAsync(ByVal ContainerId As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentResult) Implements EDMIServiceReference.IEDMIService.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
+        Public Function ImportFile(ByVal FileInfo As System.IO.FileInfo, ByVal Contents() As Byte, ByVal [ReadOnly] As Boolean, ByVal RetentionTime As Integer) As EDMIServiceReference.DocumentResult2 Implements EDMIServiceReference.IEDMIService.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 EDMIServiceReference.DocumentResult2) Implements EDMIServiceReference.IEDMIService.ImportFileAsync
+            Return MyBase.Channel.ImportFileAsync(FileInfo, Contents, [ReadOnly], RetentionTime)
+        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 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
+        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
--- a/Services/EDMIServiceReference/System.Data.xsd
+++ b/Services/EDMIServiceReference/System.Data.xsd
--- a/Services/EDMIServiceReference/System.IO.xsd
+++ b/Services/EDMIServiceReference/System.IO.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;&gt;&lt;security mode=&quot;None&quot;&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;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;EDMIServiceReference.IEDMIService&quot; name=&quot;tcpBinding&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&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="iWIOdzq/CtaAM4SQMzp+vG4wC2Y=">
  <bindingConfigurations>
    <bindingConfiguration bindingType="netTcpBinding" name="tcpBinding">
      <properties>
@@ -81,8 +81,8 @@
        <property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.NetTcpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.NetTcpSecurityElement</serializedValue>
        </property>
-        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.SecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>Transport</serializedValue>
+        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.SecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>None</serializedValue>
        </property>
        <property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.TcpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
          <serializedValue>System.ServiceModel.Configuration.TcpTransportSecurityElement</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>
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@@ -1,46 +1,23 @@
 <?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>
        <msb:BinaryEncoding xmlns:msb="http://schemas.microsoft.com/ws/06/2004/mspolicy/netbinary1">
        </msb:BinaryEncoding>
-        <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-          <wsp:Policy>
-            <sp:TransportToken>
-              <wsp:Policy>
-                <msf:WindowsTransportSecurity xmlns:msf="http://schemas.microsoft.com/ws/2006/05/framing/policy">
-                  <msf:ProtectionLevel>EncryptAndSign</msf:ProtectionLevel>
-                </msf:WindowsTransportSecurity>
-              </wsp:Policy>
-            </sp:TransportToken>
-            <sp:AlgorithmSuite>
-              <wsp:Policy>
-                <sp:Basic256>
-                </sp:Basic256>
-              </wsp:Policy>
-            </sp:AlgorithmSuite>
-            <sp:Layout>
-              <wsp:Policy>
-                <sp:Strict>
-                </sp:Strict>
-              </wsp:Policy>
-            </sp:Layout>
-          </wsp:Policy>
-        </sp:TransportBinding>
        <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 +26,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 +35,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 +44,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 +53,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 +62,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 +71,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 +80,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 +89,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 +98,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 +107,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 +116,16 @@
      </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>
+      <wsdl:output>
+        <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>
        <soap12:body use="literal" />
      </wsdl:input>
@@ -157,7 +134,7 @@
      </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,7 +143,7 @@
      </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>
--- 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.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/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/Document.vb
+++ b/Modules.EDMIAPI/Document.vb
@@ -1,13 +1,13 @@
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.EDMIAPI.IDBServiceReference
+Imports DigitalData.Modules.EDMI.API.EDMIServiceReference
 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
+    Private _channelFactory As ChannelFactory(Of IEDMIServiceChannel)
+    Private _channel As IEDMIServiceChannel

    ''' <summary>
    ''' Creates a new EDMIAPI object
@@ -21,7 +21,7 @@ Public Class Document
        Try
            Dim oBinding = Channel.GetBinding()
            Dim oAddress = New EndpointAddress(ServiceAdress)
-            Dim oFactory = New ChannelFactory(Of IIDBServiceChannel)(oBinding, oAddress)
+            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)

            _channelFactory = oFactory
        Catch ex As Exception
@@ -167,7 +167,7 @@ Public Class Document
    ''' Creates a channel and adds a Faulted-Handler
    ''' </summary>
    ''' <returns>A channel object</returns>
-    Private Function GetChannel() As IIDBServiceChannel
+    Private Function GetChannel() As IEDMIServiceChannel
        Try
            _logger.Debug("Creating channel..")
            Dim oChannel = _channelFactory.CreateChannel()
--- 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>
@@ -73,7 +73,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Channel.vb" />
-    <Compile Include="Connected Services\IDBServiceReference\Reference.vb">
+    <Compile Include="Connected Services\EDMIServiceReference\Reference.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
      <DependentUpon>Reference.svcmap</DependentUpon>
@@ -106,45 +106,45 @@
  </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.DocumentResult.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.DocumentResult2.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.IndexResult.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.NonQueryResult.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.ScalarResult.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.TableResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
-    <None Include="Connected Services\IDBServiceReference\DigitalData.Modules.Filesystem.xsd">
+    <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\service.wsdl" />
+    <None Include="Connected Services\EDMIServiceReference\service.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.Data.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.Data.xsd">
      <SubType>Designer</SubType>
    </None>
-    <None Include="Connected Services\IDBServiceReference\System.IO.xsd">
+    <None Include="Connected Services\EDMIServiceReference\System.IO.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">
@@ -168,16 +168,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/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
@@ -26,7 +26,7 @@
        <bindings>
            <netTcpBinding>
                <binding name="tcpBinding">
-                    <security>
+                    <security mode="None">
                        <transport sslProtocols="None" />
                    </security>
                </binding>
@@ -35,7 +35,7 @@
        <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" />
                </identity>
--- 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
@@ -102,6 +102,7 @@ Public Class LogConfig
        AppData = 0
        CurrentDirectory = 1
        CustomPath = 2
+        Temp = 3
    End Enum

    ''' <summary>
@@ -182,6 +183,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 +219,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 {
--- 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.0.1")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- 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.3")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
--- a/Modules.Windream/Windream.vb
+++ b/Modules.Windream/Windream.vb
@@ -101,6 +101,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
@@ -731,7 +733,7 @@ Public Class Windream
            If UsesDriveLetter Then
                ' Remove Driveletter eg. W:\
                If oNormalizedPath.StartsWith($"{ClientDriveLetter}:\") Then
-                    oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter + 2)
+                    oNormalizedPath = oNormalizedPath.Substring(ClientDriveLetter.Length + 2)
                End If
            Else
                If oNormalizedPath.ToLower.StartsWith(ClientBasePath.ToLower) Then
@@ -1104,6 +1106,7 @@ Public Class Windream
            Return True
        Catch ex As Exception
            _logger.Error(ex)
+            UnlockObject(oWMObject)
            Return False
        End Try
    End Function
@@ -1343,6 +1346,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
--- 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/SERVICES/DDEDM_NetworkService/App.config
+++ b/SERVICES/DDEDM_NetworkService/App.config
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.diagnostics>
-    <sources>
-      <source name="System.ServiceModel" switchValue="Information,ActivityTracing"
-        propagateActivity="true">
-        <listeners>
-          <add name="xml" />
-        </listeners>
-      </source>
-      <source name="System.ServiceModel.MessageLogging">
-        <listeners>
-          <add name="xml" />
-        </listeners>
-      </source>
-    </sources>
-    <sharedListeners>
-      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener"
-        name="xml" />
-    </sharedListeners>
-    <trace autoflush="true" />
-  </system.diagnostics>
-  <appSettings>
-    <add key="FIREBIRD_DATASOURCE" value="" />
-    <add key="FIREBIRD_DATABASE_NAME" value="" />
-    <add key="FIREBIRD_DATABASE_USER" value="" />
-    <add key="FIREBIRD_DATABASE_PASS" value="" />
-    <add key="CONTAINER_PATH" value="" />
-    <add key="CONTAINER_PASSWORD" value="" />
-  </appSettings>
-  <system.serviceModel>
-    <diagnostics wmiProviderEnabled="true">
-      <messageLogging logEntireMessage="true" logMalformedMessages="true"
-        logMessagesAtTransportLevel="true" />
-      <endToEndTracing propagateActivity="true" activityTracing="true"
-        messageFlowTracing="true" />
-    </diagnostics>
-    <bindings>
-      <netTcpBinding>
-        <binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered"
-          maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
-          <readerQuotas maxDepth="32" maxStringContentLength="2147483647"
-            maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
-          <security mode="None">
-            <transport clientCredentialType="None" />
-          </security>
-        </binding>
-      </netTcpBinding>
-    </bindings>
-    <services>
-      <service behaviorConfiguration="DefaultServiceBehavior" name="DigitalData.Services.IDBService.IDBService">
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding"
-          name="tcpBinding" contract="DigitalData.Services.IDBService.IIDBService">
-          <identity>
-            <dns value="localhost" />
-          </identity>
-        </endpoint>
-        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding"
-          contract="IMetadataExchange" />
-        <host>
-          <baseAddresses>
-            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main" />
-          </baseAddresses>
-        </host>
-      </service>
-    </services>
-    <behaviors>
-      <serviceBehaviors>
-        <behavior name="DefaultServiceBehavior">
-          <serviceMetadata httpGetEnabled="false" />
-          <serviceDebug includeExceptionDetailInFaults="true" />
-        </behavior>
-      </serviceBehaviors>
-    </behaviors>
-  </system.serviceModel>
-<system.data>
-		<DbProviderFactories>
-			<remove invariant="FirebirdSql.Data.FirebirdClient" />
-			<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
-		</DbProviderFactories>
-	</system.data></configuration>
--- a/SERVICES/DDEDM_NetworkService/EDMIService.vb
+++ b/SERVICES/DDEDM_NetworkService/EDMIService.vb
@@ -1,341 +0,0 @@
-Imports System.ServiceModel
-Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Filesystem
-Imports DigitalData.Services.EDMIService
-Imports System.IO
-
-<ServiceBehavior(InstanceContextMode:=InstanceContextMode.PerSession)>
-Public Class EDMIService
-    Implements IEDMIService
-
-    Public Shared LogConfig As LogConfig
-    Public Shared Database As Firebird
-    Public Shared AppConfig As AppConfig
-
-    Private ReadOnly _logger As Logger
-
-    Private _request As Request = Nothing
-    Private _debug As Boolean = False
-    Private _username As String
-
-    Public Sub New()
-        Dim oOperationContext As OperationContext = OperationContext.Current
-        Dim oInstanceContext As InstanceContext = oOperationContext.InstanceContext
-        Dim oUsername = oOperationContext.ServiceSecurityContext.WindowsIdentity.Name
-
-        _username = oUsername
-        _logger = LogConfig.GetLogger()
-    End Sub
-
-#Region "Auth"
-    Private Function TestUserAuth() As Boolean
-        Try
-            'Dim oSQL As String = $"SELECT FNIDB_AUTH_USER('{_username}') FROM RDB$DATABASE;"
-            'Dim oResult As Boolean = Database.GetScalarValue(oSQL)
-            'Return oResult
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
-#End Region
-#Region "Heartbeat"
-    Public Function Heartbeat() As Boolean Implements IEDMIService.Heartbeat
-        Return True
-    End Function
-#End Region
-#Region "Request"
-    Public Sub CreateRequest(Name As String, Optional Debug As Boolean = False)
-        _request = New Request(Name, _username, Database, Debug)
-        _debug = Debug
-
-        _logger.Info("Creating request {0}/{1}", _request.Name, _request.RequestId)
-    End Sub
-
-    Public Function CreateDatabaseRequest(Name As String, Optional Debug As Boolean = False) As String Implements IEDMIService.CreateDatabaseRequest
-        CreateRequest(Name, Debug)
-
-        Return _request.Name
-    End Function
-
-    Public Sub CloseDatabaseRequest() Implements IEDMIService.CloseDatabaseRequest
-        If IsNothing(_request) Then
-            Exit Sub
-        End If
-
-        _logger.Info("Closing request {0}", _request.ToString)
-        _request.Connection.Close()
-        _request = Nothing
-    End Sub
-
-#End Region
-#Region "Database"
-    Private Sub TestRequestCreated()
-        If IsNothing(_request) Then
-            Throw New Exceptions.NoRequestException()
-        End If
-    End Sub
-
-    Public Function ReturnDatatable(SQL As String) As TableResult Implements IEDMIService.ReturnDatatable
-        Try
-            TestRequestCreated()
-
-            _logger.Info($"ReturnDatatable, SQL: {SQL}")
-            _request.LogDebug($"ReturnDatatable, SQL: {SQL}")
-
-            Dim oResult As DataTable = Database.GetDatatableWithConnection(SQL, _request.Connection)
-            Return New TableResult(oResult)
-        Catch ex As Exception
-            _logger.Error(ex)
-            _request.LogError(ex.Message)
-            Return New TableResult(ex.Message)
-        End Try
-    End Function
-
-    Public Function ReturnScalar(SQL As String) As ScalarResult Implements IEDMIService.ReturnScalar
-        Try
-            TestRequestCreated()
-
-            _logger.Info($"ReturnScalar, SQL: {SQL}")
-            _request.LogDebug($"ReturnScalar, SQL: {SQL}")
-
-            Dim oResult As Object = Database.GetScalarValueWithConnection(SQL, _request.Connection)
-            Return New ScalarResult(oResult)
-        Catch ex As Exception
-            _logger.Error(ex)
-            _request.LogError(ex.Message)
-            Return New ScalarResult(ex.Message)
-        End Try
-    End Function
-
-    Public Function ExecuteNonQuery(SQL As String) As NonQueryResult Implements IEDMIService.ExecuteNonQuery
-        Try
-            TestRequestCreated()
-
-            _logger.Info($"ExecuteNonQuery, SQL: {SQL}")
-            _request.LogDebug($"ExecuteNonQuery, SQL: {SQL}")
-
-            Dim oResult As Boolean = Database.ExecuteNonQueryWithConnection(SQL, _request.Connection)
-            Return New NonQueryResult()
-        Catch ex As Exception
-            _logger.Error(ex)
-            _request.LogError(ex.Message)
-            Return New NonQueryResult(ex.Message)
-        End Try
-    End Function
-
-
-#End Region
-#Region "Document (with FileContainer)"
-    'Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
-    '    Try
-    '        Dim oContainer As FileContainer
-    '        Dim oContainerId As String
-
-    '        If Not TestUserAuth() Then
-    '            Throw New Exception($"User {_username} not authorized.")
-    '        End If
-
-    '        oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
-    '        oContainerId = oContainer.ContainerId
-    '        _logger.Debug("Container created with id {0}", oContainerId)
-
-    '        Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
-    '        _logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
-
-    '        Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
-    '        Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
-
-    '        If oDocId = -1 Then
-    '            _logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
-    '            Return Nothing
-    '        End If
-
-    '        _logger.Debug("Database Entry created with DocId {0}", oDocId)
-
-    '        oContainer.SetFile(Contents, FileName)
-    '        oContainer.SaveAs(GetContainerPath(oContainerId))
-
-    '        _logger.Debug("File saved in Container!", FileName)
-
-    '        Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
-    '        Return New DocumentResult(oDocument)
-    '    Catch ex As Exception
-    '        _logger.Error(ex)
-    '        Return New DocumentResult(ex.Message)
-    '    End Try
-    'End Function
-
-    'Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
-    '    Try
-    '        TestFileExists(DocObject.ContainerId)
-
-    '        ' TODO: update db
-
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
-
-    '        oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
-    '        oFileContainer.Save()
-
-
-    '        Return New DocumentResult(DocObject)
-    '    Catch ex As Exception
-    '        _logger.Error(ex)
-    '        Return Nothing
-    '    End Try
-    'End Function
-
-    'Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
-    '    Try
-    '        TestFileExists(DocObject.ContainerId)
-
-    '        Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
-
-    '        Return New DocumentResult(DocObject, oContents)
-    '    Catch ex As Exception
-    '        _logger.Error(ex)
-    '        Return New DocumentResult(ex.Message)
-    '    End Try
-    'End Function
-
-    'Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
-    '    Try
-    '        TestFileExists(DocObject.ContainerId)
-
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        IO.File.Delete(oFilePath)
-
-    '        'TODO: Delete doc from db
-
-    '        Return True
-    '    Catch ex As Exception
-    '        _logger.Error(ex)
-    '        Return False
-    '    End Try
-    'End Function
-
-    'Private Function GetContainerPath(ContainerId As String) As String
-    '    Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
-    'End Function
-
-    'Private Function GetContainerName(ContainerId As String) As String
-    '    Return ContainerId & ".enc"
-    'End Function
-
-    'Private Sub TestFileExists(ContainerId)
-    '    Dim oContainerPath = GetContainerPath(ContainerId)
-
-    '    If Not IO.File.Exists(oContainerPath) Then
-    '        Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
-    '    End If
-    'End Sub
-
-    'Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
-    '    Try
-    '        Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
-    '        Dim oTable = Database.GetDatatable(oSQL)
-
-    '        If oTable.Rows.Count = 0 Then
-    '            Return New DocumentResult("Document not found")
-    '        End If
-
-    '        Dim oRow As DataRow = oTable.Rows.Item(0)
-    '        Dim oDocument As New DocumentObject(
-    '            oRow.Item("CONTAINER_ID"),
-    '            oRow.Item("GUID"),
-    '            oRow.Item("ORIGINAL_FILENAME")
-    '        )
-
-    '        TestFileExists(oDocument.ContainerId)
-
-    '        Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
-
-    '        Return New DocumentResult(oDocument, oContents)
-    '    Catch ex As Exception
-    '        Return New DocumentResult(ex.Message)
-    '    End Try
-    'End Function
-
-    'Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
-    '    Try
-    '        Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
-    '        Dim oTable = Database.GetDatatable(oSQL)
-
-    '        If oTable.Rows.Count = 0 Then
-    '            Return New DocumentResult("Document not found")
-    '        End If
-
-    '        Dim oRow As DataRow = oTable.Rows.Item(0)
-    '        Dim oDocument As New DocumentObject(
-    '            oRow.Item("CONTAINER_ID"),
-    '            oRow.Item("GUID"),
-    '            oRow.Item("ORIGINAL_FILENAME")
-    '        )
-
-    '        TestFileExists(oDocument.ContainerId)
-
-    '        Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
-    '        Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
-    '        Dim oContents As Byte() = oContainer.GetFile().Contents
-
-    '        Return New DocumentResult(oDocument, oContents)
-    '    Catch ex As Exception
-    '        Return New DocumentResult(ex.Message)
-    '    End Try
-    'End Function
-#End Region
-
-#Region "Document"
-    Public Function ImportFile(FileInfo As FileInfo, Contents() As Byte, [Readonly] As Boolean, RetentionPeriod As Integer) As DocumentResult2 Implements IEDMIService.ImportFile
-        Dim oFilePath = Path.Combine(AppConfig.ContainerPath, FileInfo.Name)
-        Dim oDocument = New DocumentResult2.DocumentObject() With {.FileName = FileInfo.Name}
-
-        Try
-            _logger.Info("Saving file [{0}] to path [{1}]", FileInfo.Name, oFilePath)
-            Using oStream = New FileStream(oFilePath, FileMode.CreateNew)
-                oStream.Write(Contents, 0, Contents.Length)
-                oStream.Flush(True)
-                oStream.Close()
-            End Using
-
-            Dim oAttributes = IO.File.GetAttributes(oFilePath) Or FileAttributes.ReadOnly
-
-            If RetentionPeriod Then
-                _logger.Info("Setting LastAccessTime")
-                IO.File.SetLastAccessTime(oFilePath, Date.Now.AddYears(30))
-            End If
-
-            If [Readonly] Then
-                _logger.Info("Setting ReadOnly Attribute")
-                IO.File.SetAttributes(oFilePath, oAttributes)
-            End If
-
-            Return New DocumentResult2(oDocument)
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return New DocumentResult2(ex.Message)
-        End Try
-    End Function
-#End Region
-
-#Region "Index"
-    Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult Implements IEDMIService.NewFileIndex
-        Try
-            Dim oSQL = $"SELECT FNIDB_NEW_DOC_VALUE({DocObject.DocumentId},'{Syskey}','{LanguageCode}','{Value}','{_username}') FROM RDB$DATABASE;"
-            Dim oIndexId As Int64 = Database.GetScalarValue(oSQL)
-
-            Return New IndexResult(oIndexId)
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return New IndexResult(ex.Message)
-        End Try
-    End Function
-#End Region
-End Class
--- a/SERVICES/DDEDM_NetworkService/packages.config
+++ b/SERVICES/DDEDM_NetworkService/packages.config
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FirebirdSql.Data.FirebirdClient" version="6.4.0" targetFramework="net461" />
-  <package id="NLog" version="4.6.8" targetFramework="net461" />
-</packages>
--- a/Service.EDMIService/App.config
+++ b/Service.EDMIService/App.config
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <system.diagnostics>
+    <sources>
+      <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
+        <listeners>
+          <add name="xml"/>
+        </listeners>
+      </source>
+      <source name="System.ServiceModel.MessageLogging">
+        <listeners>
+          <add name="xml"/>
+        </listeners>
+      </source>
+    </sources>
+    <sharedListeners>
+      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
+    </sharedListeners>
+    <trace autoflush="true"/>
+  </system.diagnostics>
+  <appSettings>
+    <!-- FIREBIRD SETTINGS -->
+    <add key="FIREBIRD_DATASOURCE" value=""/>
+    <add key="FIREBIRD_DATABASE_NAME" value=""/>
+    <add key="FIREBIRD_DATABASE_USER" value=""/>
+    <add key="FIREBIRD_DATABASE_PASS" value=""/>
+    <!-- END FIREBIRD SETTINGS -->
+
+    <!-- DATASTORE SETTINGS -->
+    <add key="DATASTORE_PATH" value=""/> 
+    <!-- END DATASTORE SETTINGS -->
+    
+    <!-- CONTAINER SETTINGS -->
+    <add key="CONTAINER_PATH" value=""/>
+    <add key="CONTAINER_PASSWORD" value=""/>
+    <!-- END CONTAINER SETTINGS -->
+  </appSettings>
+  <system.serviceModel>
+    <diagnostics wmiProviderEnabled="true">
+      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
+      <endToEndTracing propagateActivity="true" activityTracing="true" messageFlowTracing="true"/>
+    </diagnostics>
+    <bindings>
+      <netTcpBinding>
+        <binding name="tcpBinding" sendTimeout="00:10:00" transferMode="Buffered" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
+          <security mode="None">
+            <transport clientCredentialType="None"/>
+          </security>
+        </binding>
+      </netTcpBinding>
+    </bindings>
+    <services>
+      <service behaviorConfiguration="DefaultServiceBehavior" name="DigitalData.Services.EDMIService.EDMIService">
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding" name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
+          <identity>
+            <dns value="localhost"/>
+          </identity>
+        </endpoint>
+        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding" contract="IMetadataExchange"/>
+        <host>
+          <baseAddresses>
+            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main"/>
+          </baseAddresses>
+        </host>
+      </service>
+    </services>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior name="DefaultServiceBehavior">
+          <serviceMetadata httpGetEnabled="false"/>
+          <serviceDebug includeExceptionDetailInFaults="true"/>
+        </behavior>
+      </serviceBehaviors>
+    </behaviors>
+  </system.serviceModel>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.5.0.0" newVersion="6.5.0.0"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
--- a/SERVICES/DDEDM_NetworkService/AppConfig.vb
+++ b/SERVICES/DDEDM_NetworkService/AppConfig.vb
@@ -7,6 +7,7 @@ Public Class AppConfig
    Public Shared FirebirdPassword As String
    Public Shared ContainerPath As String
    Public Shared ContainerPassword As String
+    Public Shared DatastorePath As String

    Public Shared Sub Load()
        With ConfigurationManager.AppSettings
@@ -16,6 +17,7 @@ Public Class AppConfig
            FirebirdPassword = .Item("FIREBIRD_DATABASE_PASS")
            ContainerPath = .Item("CONTAINER_PATH")
            ContainerPassword = .Item("CONTAINER_PASSWORD")
+            DatastorePath = .Item("DATASTORE_PATH")
        End With
    End Sub
 End Class
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -0,0 +1,335 @@
+Imports System.ServiceModel
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules
+Imports System.IO
+
+<ServiceBehavior(InstanceContextMode:=InstanceContextMode.PerSession)>
+Public Class EDMIService
+    Implements IEDMIService
+
+    Public Shared LogConfig As LogConfig
+    Public Shared Database As Firebird
+    Public Shared AppConfig As AppConfig
+    Public Shared EDMIPath As EDMI.File.Path
+    Public Shared EDMIArchive As EDMI.File.Archive
+
+    Private ReadOnly _logger As Logger
+
+    Private _request As Request = Nothing
+    Private _debug As Boolean = False
+    Private _username As String
+
+
+    Public Sub New()
+        Dim oOperationContext As OperationContext = OperationContext.Current
+        Dim oInstanceContext As InstanceContext = oOperationContext.InstanceContext
+        Dim oUsername = oOperationContext.ServiceSecurityContext.WindowsIdentity.Name
+
+        _username = oUsername
+        _logger = LogConfig.GetLogger()
+    End Sub
+
+#Region "Auth"
+    Private Function TestUserAuth() As Boolean
+        Try
+            'Dim oSQL As String = $"SELECT FNIDB_AUTH_USER('{_username}') FROM RDB$DATABASE;"
+            'Dim oResult As Boolean = Database.GetScalarValue(oSQL)
+            'Return oResult
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+#End Region
+#Region "Heartbeat"
+    Public Function Heartbeat() As Boolean Implements IEDMIService.Heartbeat
+        Return True
+    End Function
+#End Region
+#Region "Request"
+    Public Sub CreateRequest(Name As String, Optional Debug As Boolean = False)
+        _request = New Request(Name, _username, Database, Debug)
+        _debug = Debug
+
+        _logger.Info("Creating request {0}/{1}", _request.Name, _request.RequestId)
+    End Sub
+
+    Public Function CreateDatabaseRequest(Name As String, Optional Debug As Boolean = False) As String Implements IEDMIService.CreateDatabaseRequest
+        CreateRequest(Name, Debug)
+
+        Return _request.Name
+    End Function
+
+    Public Sub CloseDatabaseRequest() Implements IEDMIService.CloseDatabaseRequest
+        If IsNothing(_request) Then
+            Exit Sub
+        End If
+
+        _logger.Info("Closing request {0}", _request.ToString)
+        _request.Connection.Close()
+        _request = Nothing
+    End Sub
+
+#End Region
+#Region "Database"
+    Private Sub TestRequestCreated()
+        If IsNothing(_request) Then
+            Throw New Exceptions.NoRequestException()
+        End If
+    End Sub
+
+    Public Function ReturnDatatable(SQL As String) As TableResult Implements IEDMIService.ReturnDatatable
+        Try
+            TestRequestCreated()
+
+            _logger.Info($"ReturnDatatable, SQL: {SQL}")
+            _request.LogDebug($"ReturnDatatable, SQL: {SQL}")
+
+            Dim oResult As DataTable = Database.GetDatatableWithConnection(SQL, _request.Connection)
+            Return New TableResult(oResult)
+        Catch ex As Exception
+            _logger.Error(ex)
+            _request.LogError(ex.Message)
+            Return New TableResult(ex.Message)
+        End Try
+    End Function
+
+    Public Function ReturnScalar(SQL As String) As ScalarResult Implements IEDMIService.ReturnScalar
+        Try
+            TestRequestCreated()
+
+            _logger.Info($"ReturnScalar, SQL: {SQL}")
+            _request.LogDebug($"ReturnScalar, SQL: {SQL}")
+
+            Dim oResult As Object = Database.GetScalarValueWithConnection(SQL, _request.Connection)
+            Return New ScalarResult(oResult)
+        Catch ex As Exception
+            _logger.Error(ex)
+            _request.LogError(ex.Message)
+            Return New ScalarResult(ex.Message)
+        End Try
+    End Function
+
+    Public Function ExecuteNonQuery(SQL As String) As NonQueryResult Implements IEDMIService.ExecuteNonQuery
+        Try
+            TestRequestCreated()
+
+            _logger.Info($"ExecuteNonQuery, SQL: {SQL}")
+            _request.LogDebug($"ExecuteNonQuery, SQL: {SQL}")
+
+            Dim oResult As Boolean = Database.ExecuteNonQueryWithConnection(SQL, _request.Connection)
+            Return New NonQueryResult()
+        Catch ex As Exception
+            _logger.Error(ex)
+            _request.LogError(ex.Message)
+            Return New NonQueryResult(ex.Message)
+        End Try
+    End Function
+
+
+#End Region
+#Region "Document (with FileContainer)"
+    Public Function NewFile(FileName As String, Contents() As Byte) As DocumentResult Implements IEDMIService.NewFile
+        Try
+            Dim oContainer As FileContainer
+            Dim oContainerId As String
+
+            If Not TestUserAuth() Then
+                Throw New Exception($"User {_username} not authorized.")
+            End If
+
+            oContainer = FileContainer.Create(LogConfig, AppConfig.ContainerPassword)
+            oContainerId = oContainer.ContainerId
+            _logger.Debug("Container created with id {0}", oContainerId)
+
+            Dim oExtension As String = Path.GetExtension(FileName).Substring(1)
+            _logger.Debug("File extension of file {0} is {1}", FileName, oExtension)
+
+            Dim oSQL = $"SELECT FNICM_NEW_DOC('010', '{oContainerId}', '{GetContainerName(oContainerId)}', '{FileName}', '{oExtension}', '{_username}') FROM RDB$DATABASE;"
+            Dim oDocId As Int64 = Database.GetScalarValue(oSQL)
+
+            If oDocId = -1 Then
+                _logger.Warn("Database returned -1 while creating Document Entry. File was not saved!")
+                Return Nothing
+            End If
+
+            _logger.Debug("Database Entry created with DocId {0}", oDocId)
+
+            oContainer.SetFile(Contents, FileName)
+            oContainer.SaveAs(GetContainerPath(oContainerId))
+
+            _logger.Debug("File saved in Container!", FileName)
+
+            Dim oDocument = New DocumentObject(oContainerId, oDocId, FileName)
+            Return New DocumentResult(oDocument)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return New DocumentResult(ex.Message)
+        End Try
+    End Function
+
+    Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
+        Try
+            TestFileExists(DocObject.ContainerId)
+
+            ' TODO: update db
+
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
+
+            oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
+            oFileContainer.Save()
+
+
+            Return New DocumentResult(DocObject)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
+    Public Function GetFile(DocObject As DocumentObject) As DocumentResult Implements IEDMIService.GetFile
+        Try
+            TestFileExists(DocObject.ContainerId)
+
+            Dim oContainerPath = GetContainerPath(DocObject.ContainerId)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContents As Byte() = oContainer.GetFile().Contents
+
+            Return New DocumentResult(DocObject, oContents)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return New DocumentResult(ex.Message)
+        End Try
+    End Function
+
+    Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
+        Try
+            TestFileExists(DocObject.ContainerId)
+
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            IO.File.Delete(oFilePath)
+
+            'TODO: Delete doc from db
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Private Function GetContainerPath(ContainerId As String) As String
+        Return Path.Combine(AppConfig.ContainerPath, GetContainerName(ContainerId))
+    End Function
+
+    Private Function GetContainerName(ContainerId As String) As String
+        Return ContainerId & ".enc"
+    End Function
+
+    Private Sub TestFileExists(ContainerId)
+        Dim oContainerPath = GetContainerPath(ContainerId)
+
+        If Not IO.File.Exists(oContainerPath) Then
+            Throw New FileNotFoundException("Container existiert nicht", oContainerPath)
+        End If
+    End Sub
+
+    Public Function GetDocumentByDocumentId(DocumentId As Long) As DocumentResult Implements IEDMIService.GetDocumentByDocumentId
+        Try
+            Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE GUID = {DocumentId}"
+            Dim oTable = Database.GetDatatable(oSQL)
+
+            If oTable.Rows.Count = 0 Then
+                Return New DocumentResult("Document not found")
+            End If
+
+            Dim oRow As DataRow = oTable.Rows.Item(0)
+            Dim oDocument As New DocumentObject(
+                oRow.Item("CONTAINER_ID"),
+                oRow.Item("GUID"),
+                oRow.Item("ORIGINAL_FILENAME")
+            )
+
+            TestFileExists(oDocument.ContainerId)
+
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContents As Byte() = oContainer.GetFile().Contents
+
+            Return New DocumentResult(oDocument, oContents)
+        Catch ex As Exception
+            Return New DocumentResult(ex.Message)
+        End Try
+    End Function
+
+    Public Function GetDocumentByContainerId(ContainerId As String) As DocumentResult Implements IEDMIService.GetDocumentByContainerId
+        Try
+            Dim oSQL = $"SELECT GUID, CONTAINER_ID, ORIGINAL_FILENAME FROM TBIDB_DOCUMENT WHERE CONTAINER_ID = '{ContainerId}'"
+            Dim oTable = Database.GetDatatable(oSQL)
+
+            If oTable.Rows.Count = 0 Then
+                Return New DocumentResult("Document not found")
+            End If
+
+            Dim oRow As DataRow = oTable.Rows.Item(0)
+            Dim oDocument As New DocumentObject(
+                oRow.Item("CONTAINER_ID"),
+                oRow.Item("GUID"),
+                oRow.Item("ORIGINAL_FILENAME")
+            )
+
+            TestFileExists(oDocument.ContainerId)
+
+            Dim oContainerPath = GetContainerPath(oDocument.ContainerId)
+            Dim oContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oContainerPath)
+            Dim oContents As Byte() = oContainer.GetFile().Contents
+
+            Return New DocumentResult(oDocument, oContents)
+        Catch ex As Exception
+            Return New DocumentResult(ex.Message)
+        End Try
+    End Function
+#End Region
+
+#Region "Document"
+    Public Function ImportFile(FileInfo As FileInfo, Contents() As Byte, [Readonly] As Boolean, RetentionPeriod As Integer) As DocumentResult2 Implements IEDMIService.ImportFile
+        Dim oDocumentType As String = "DummyDocumentType"
+        Dim oFilePath = Path.Combine(EDMIPath.GetActivePath(oDocumentType), FileInfo.Name)
+        Dim oDocument = New DocumentResult2.DocumentObject() With {.FileName = FileInfo.Name}
+
+        Try
+            _logger.Info("Saving file [{0}] to path [{1}]", FileInfo.Name, oFilePath)
+            Using oStream = New FileStream(oFilePath, FileMode.CreateNew)
+                oStream.Write(Contents, 0, Contents.Length)
+                oStream.Flush(True)
+                oStream.Close()
+            End Using
+
+            EDMIArchive.SetRetention(oFilePath, RetentionPeriod, [Readonly])
+
+            Return New DocumentResult2(oDocument)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return New DocumentResult2(ex.Message)
+        End Try
+    End Function
+#End Region
+
+#Region "Index"
+    Public Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult Implements IEDMIService.NewFileIndex
+        Try
+            Dim oSQL = $"SELECT FNIDB_NEW_DOC_VALUE({DocObject.DocumentId},'{Syskey}','{LanguageCode}','{Value}','{_username}') FROM RDB$DATABASE;"
+            Dim oIndexId As Int64 = Database.GetScalarValue(oSQL)
+
+            Return New IndexResult(oIndexId)
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return New IndexResult(ex.Message)
+        End Try
+    End Function
+#End Region
+End Class
--- a/SERVICES/DDEDM_NetworkService/EDMIService.vbproj
+++ b/SERVICES/DDEDM_NetworkService/EDMIService.vbproj
@@ -11,8 +11,24 @@
    <AssemblyName>EDMIService</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,12 +63,12 @@
    <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="FirebirdSql.Data.FirebirdClient, Version=6.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.6.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.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>
+      <HintPath>..\packages\NLog.4.7.0\lib\net45\NLog.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
@@ -64,6 +80,7 @@
    <Reference Include="System.ServiceModel" />
    <Reference Include="System.ServiceProcess" />
    <Reference Include="System.Transactions" />
+    <Reference Include="System.Web.Extensions" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Core" />
@@ -145,22 +162,34 @@
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\..\Modules.Database\Database.vbproj">
+    <ProjectReference Include="..\EDMI.File\EDMI.File.vbproj">
+      <Project>{1477032d-7a02-4c5f-b026-a7117da4bc6b}</Project>
+      <Name>EDMI.File</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Modules.Database\Database.vbproj">
      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
      <Name>Database</Name>
    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.EDMIAPI\EDMI.API.vbproj">
-      <Project>{5B1171DC-FFFE-4813-A20D-786AAE47B320}</Project>
-      <Name>EDMI.API</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Modules.Filesystem\Filesystem.vbproj">
+    <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>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 und x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
--- a/SERVICES/DDEDM_NetworkService/Exceptions.vb
+++ b/SERVICES/DDEDM_NetworkService/Exceptions.vb
--- a/SERVICES/DDEDM_NetworkService/IDBService.vb
+++ b/SERVICES/DDEDM_NetworkService/IDBService.vb
--- a/SERVICES/DDEDM_NetworkService/IEDMIService.vb
+++ b/SERVICES/DDEDM_NetworkService/IEDMIService.vb
@@ -28,23 +28,23 @@ Interface IEDMIService
 #End Region

 #Region "Document (with FileContainer)"
-    '<OperationContract>
-    'Function NewFile(FileName As String, Contents As Byte()) As DocumentResult
+    <OperationContract>
+    Function NewFile(FileName As String, Contents As Byte()) As DocumentResult

-    '<OperationContract>
-    'Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult
+    <OperationContract>
+    Function UpdateFile(DocObject As DocumentObject, Contents As Byte()) As DocumentResult

-    '<OperationContract>
-    'Function GetFile(DocObject As DocumentObject) As DocumentResult
+    <OperationContract>
+    Function GetFile(DocObject As DocumentObject) As DocumentResult

-    '<OperationContract>
-    'Function DeleteFile(DocObject As DocumentObject) As Boolean
+    <OperationContract>
+    Function DeleteFile(DocObject As DocumentObject) As Boolean

-    '<OperationContract>
-    'Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult
+    <OperationContract>
+    Function GetDocumentByDocumentId(DocumentId As Int64) As DocumentResult

-    '<OperationContract>
-    'Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
+    <OperationContract>
+    Function GetDocumentByContainerId(ContainerId As String) As DocumentResult
 #End Region

 #Region "Document (New)"
@@ -52,7 +52,6 @@ Interface IEDMIService
    Function ImportFile(FileInfo As FileInfo, Contents As Byte(), [ReadOnly] As Boolean, RetentionTime As Integer) As DocumentResult2
 #End Region

-
 #Region "Index"
    <OperationContract>
    Function NewFileIndex(DocObject As DocumentObject, Syskey As String, LanguageCode As String, Value As String) As IndexResult
--- a/SERVICES/DDEDM_NetworkService/IIDBService.vb
+++ b/SERVICES/DDEDM_NetworkService/IIDBService.vb
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices

 ' Werte der Assemblyattribute überprüfen

-<Assembly: AssemblyTitle("IDBService")>
+<Assembly: AssemblyTitle("EDMIService")>
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("IDBService")>
-<Assembly: AssemblyCopyright("Copyright ©  2018")>
+<Assembly: AssemblyProduct("EDMIService")>
+<Assembly: AssemblyCopyright("Copyright © 2020")>
 <Assembly: AssemblyTrademark("")>

 <Assembly: ComVisible(False)>
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
@@ -22,7 +22,7 @@ Namespace My.Resources
    '''<summary>
    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
        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("DigitalData.Services.IDBService.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Services.EDMIService.Resources", GetType(Resources).Assembly)
                    resourceMan = temp
                End If
                Return resourceMan
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -64,9 +64,9 @@ Namespace My
    Friend Module MySettingsProperty
        
        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DigitalData.Services.IDBService.My.MySettings
+        Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMIService.My.MySettings
            Get
-                Return Global.DigitalData.Services.IDBService.My.MySettings.Default
+                Return Global.DigitalData.Services.EDMIService.My.MySettings.Default
            End Get
        End Property
    End Module
--- a/SERVICES/DDEDM_NetworkService/My
+++ b/SERVICES/DDEDM_NetworkService/My
--- a/SERVICES/DDEDM_NetworkService/ProjectInstaller.resx
+++ b/SERVICES/DDEDM_NetworkService/ProjectInstaller.resx
--- a/Service.EDMIService/ProjectInstaller.vb
+++ b/Service.EDMIService/ProjectInstaller.vb
--- a/SERVICES/DDEDM_NetworkService/Request.vb
+++ b/SERVICES/DDEDM_NetworkService/Request.vb
--- a/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/BaseResult.vb
--- a/SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/ContainerResult.vb
--- a/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/DatabaseResult.vb
--- a/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/DocumentResult.vb
--- a/SERVICES/DDEDM_NetworkService/Results/DocumentResult2.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/DocumentResult2.vb
--- a/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
+++ b/SERVICES/DDEDM_NetworkService/Results/IndexResult.vb
--- a/SERVICES/DDEDM_NetworkService/SettingsModule.vb
+++ b/SERVICES/DDEDM_NetworkService/SettingsModule.vb
@@ -1,4 +1,4 @@
 Module SettingsModule
-    Public Const SERVICE_NAME As String = "DDIDBSvc"
-    Public Const SERVICE_DISPLAY_NAME As String = "Digital Data IDB Service"
+    Public Const SERVICE_NAME As String = "DDEDMIService"
+    Public Const SERVICE_DISPLAY_NAME As String = "Digital Data EDMI Service"
 End Module
--- a/SERVICES/DDEDM_NetworkService/WindowsService.vb
+++ b/SERVICES/DDEDM_NetworkService/WindowsService.vb
@@ -2,18 +2,21 @@
 Imports System.ServiceProcess
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
+Imports DigitalData.Modules

 Public Class WindowsService
    Inherits ServiceBase

    Private _serviceHost As ServiceHost = Nothing
-    Private _edmService As IDBService = Nothing
+    Private _edmService As IEDMIService = Nothing

    Private _logConfig As LogConfig
    Private _logger As Logger
    Private _db As Firebird
    Private _clientsConnected As Integer = 0
    Private _config As AppConfig
+    Private _Path As EDMI.File.Path
+    Private _Archive As EDMI.File.Archive

    Public Sub New()
        ServiceName = SERVICE_NAME
@@ -27,8 +30,9 @@ Public Class WindowsService
        Try
            AppConfig.Load()

-            _logConfig = New LogConfig(LogConfig.PathType.CustomPath, "E:\EDMService")
-            _logConfig.Debug = True
+            _logConfig = New LogConfig(LogConfig.PathType.CustomPath, "E:\EDMService") With {
+                .Debug = True
+            }

            _logger = _logConfig.GetLogger()

@@ -45,13 +49,22 @@ Public Class WindowsService

            _logger.Info("Database connection established.")

-            IDBService.Database = _db
-            IDBService.LogConfig = _logConfig
-            IDBService.AppConfig = _config
+            _logger.Debug("Initializing EDMI Functions")
+
+            _Path = New EDMI.File.Path(_logConfig, AppConfig.DatastorePath)
+            _Archive = New EDMI.File.Archive(_logConfig)
+
+            _logger.Debug("EDMI Functions initialized.")
+
+            EDMIService.Database = _db
+            EDMIService.LogConfig = _logConfig
+            EDMIService.AppConfig = _config
+            EDMIService.EDMIArchive = _Archive
+            EDMIService.EDMIPath = _Path

            _logger.Debug("Starting WCF ServiceHost...")

-            _serviceHost = New ServiceHost(GetType(IDBService))
+            _serviceHost = New ServiceHost(GetType(EDMIService))
            _serviceHost.Open()

            _logger.Debug("WCF ServiceHost started.")
--- a/Service.EDMIService/packages.config
+++ b/Service.EDMIService/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.5.0" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
+</packages>
--- a/Services.CommunicationService/App.config
+++ b/Services.CommunicationService/App.config
--- a/Services.CommunicationService/DD_CommunicationService.vbproj
+++ b/Services.CommunicationService/DD_CommunicationService.vbproj
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/My
+++ b/Services.CommunicationService/My
--- a/Services.CommunicationService/MyComService.Designer.vb
+++ b/Services.CommunicationService/MyComService.Designer.vb
--- a/Services.CommunicationService/MyComService.resx
+++ b/Services.CommunicationService/MyComService.resx
--- a/Services.CommunicationService/MyComService.vb
+++ b/Services.CommunicationService/MyComService.vb
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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