diff --git a/Service.EDMIService/App.config b/Service.EDMIService/App.config
index db5e4896..c9a15314 100644
--- a/Service.EDMIService/App.config
+++ b/Service.EDMIService/App.config
@@ -2,30 +2,28 @@
 <configuration>
   <system.diagnostics>
     <sources>
-      <source name="System.ServiceModel" switchValue="Information,ActivityTracing"
-        propagateActivity="true">
+      <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="xml" />
+          <add name="xml"/>
         </listeners>
       </source>
       <source name="System.ServiceModel.MessageLogging">
         <listeners>
-          <add name="xml" />
+          <add name="xml"/>
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener"
-        name="xml" />
+      <add initializeData="C:\logs\TracingAndLogging-service.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
     </sharedListeners>
-    <trace autoflush="true" />
+    <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="" />
+    <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 -->
@@ -33,42 +31,36 @@
     <!-- END DATASTORE SETTINGS -->
     
     <!-- CONTAINER SETTINGS -->
-    <add key="CONTAINER_PATH" value="" />
-    <add key="CONTAINER_PASSWORD" value="" />
+    <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" />
+      <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" />
+        <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" />
+            <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">
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="tcpBinding" name="tcpBinding" contract="DigitalData.Services.EDMIService.IEDMIService">
           <identity>
-            <dns value="localhost" />
+            <dns value="localhost"/>
           </identity>
         </endpoint>
-        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding"
-          contract="IMetadataExchange" />
+        <endpoint address="mex" binding="mexTcpBinding" name="MexTcpBinding" contract="IMetadataExchange"/>
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main" />
+            <add baseAddress="net.tcp://localhost:9000/DigitalData/Services/Main"/>
           </baseAddresses>
         </host>
       </service>
@@ -76,15 +68,18 @@
     <behaviors>
       <serviceBehaviors>
         <behavior name="DefaultServiceBehavior">
-          <serviceMetadata httpGetEnabled="false" />
-          <serviceDebug includeExceptionDetailInFaults="true" />
+          <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>
\ No newline at end of file
+  <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>
diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb
index 50accd7e..53dc1f43 100644
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -132,167 +132,167 @@ Public Class EDMIService
 
 #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
+    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
+            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)
+            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 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)
+            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
+            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)
+            _logger.Debug("Database Entry created with DocId {0}", oDocId)
 
-    '        oContainer.SetFile(Contents, FileName)
-    '        oContainer.SaveAs(GetContainerPath(oContainerId))
+            oContainer.SetFile(Contents, FileName)
+            oContainer.SaveAs(GetContainerPath(oContainerId))
 
-    '        _logger.Debug("File saved in Container!", FileName)
+            _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
+            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)
+    Public Function UpdateFile(DocObject As DocumentObject, Contents() As Byte) As DocumentResult Implements IEDMIService.UpdateFile
+        Try
+            TestFileExists(DocObject.ContainerId)
 
-    '        ' TODO: update db
+            ' TODO: update db
 
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            Dim oFileContainer As FileContainer = FileContainer.Load(LogConfig, AppConfig.ContainerPassword, oFilePath)
 
-    '        oFileContainer.SetFile(Contents, oFileContainer.GetFile.FileName)
-    '        oFileContainer.Save()
+            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
+            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)
+    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
+            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
+            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)
+    Public Function DeleteFile(DocObject As DocumentObject) As Boolean Implements IEDMIService.DeleteFile
+        Try
+            TestFileExists(DocObject.ContainerId)
 
-    '        Dim oFilePath = GetContainerPath(DocObject.ContainerId)
-    '        IO.File.Delete(oFilePath)
+            Dim oFilePath = GetContainerPath(DocObject.ContainerId)
+            IO.File.Delete(oFilePath)
 
-    '        'TODO: Delete doc from db
+            'TODO: Delete doc from db
 
-    '        Return True
-    '    Catch ex As Exception
-    '        _logger.Error(ex)
-    '        Return False
-    '    End Try
-    'End Function
+            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 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 Function GetContainerName(ContainerId As String) As String
+        Return ContainerId & ".enc"
+    End Function
 
-    'Private Sub TestFileExists(ContainerId)
-    '    Dim oContainerPath = GetContainerPath(ContainerId)
+    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
+        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)
+    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
+            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")
-    '        )
+            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)
+            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
+            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
+            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)
+    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
+            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")
-    '        )
+            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)
+            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
+            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
+            Return New DocumentResult(oDocument, oContents)
+        Catch ex As Exception
+            Return New DocumentResult(ex.Message)
+        End Try
+    End Function
 #End Region
 
 #Region "Document"
diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj
index 1c164a29..65fd134b 100644
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/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" />
@@ -162,5 +179,17 @@
       <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>
\ No newline at end of file
diff --git a/Service.EDMIService/IEDMIService.vb b/Service.EDMIService/IEDMIService.vb
index b5dcf705..d7b15caa 100644
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/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)"
diff --git a/Service.EDMIService/My Project/Resources.Designer.vb b/Service.EDMIService/My Project/Resources.Designer.vb
index 51507018..3cd07b10 100644
--- a/Service.EDMIService/My Project/Resources.Designer.vb	
+++ b/Service.EDMIService/My Project/Resources.Designer.vb	
@@ -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
diff --git a/Service.EDMIService/My Project/Settings.Designer.vb b/Service.EDMIService/My Project/Settings.Designer.vb
index eea38754..63f0e69c 100644
--- a/Service.EDMIService/My Project/Settings.Designer.vb	
+++ b/Service.EDMIService/My Project/Settings.Designer.vb	
@@ -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
@@ -62,8 +62,8 @@ Namespace My
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Module MySettingsProperty
-
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
         Friend ReadOnly Property Settings() As Global.DigitalData.Services.EDMIService.My.MySettings
             Get
                 Return Global.DigitalData.Services.EDMIService.My.MySettings.Default
diff --git a/Service.EDMIService/WindowsService.vb b/Service.EDMIService/WindowsService.vb
index 6541fb46..8e616f5c 100644
--- a/Service.EDMIService/WindowsService.vb
+++ b/Service.EDMIService/WindowsService.vb
@@ -64,7 +64,7 @@ Public Class WindowsService
 
             _logger.Debug("Starting WCF ServiceHost...")
 
-            _serviceHost = New ServiceHost(GetType(IEDMIService))
+            _serviceHost = New ServiceHost(GetType(EDMIService))
             _serviceHost.Open()
 
             _logger.Debug("WCF ServiceHost started.")
diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config
index da1b48cf..380efd84 100644
--- a/Service.EDMIService/packages.config
+++ b/Service.EDMIService/packages.config
@@ -1,5 +1,5 @@
 <?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" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="6.5.0" targetFramework="net461" />
+  <package id="NLog" version="4.7.0" targetFramework="net461" />
 </packages>
\ No newline at end of file