EDMIService: Small fixes and exception handling

2020-12-23 14:19:47 +01:00 · 2020-12-23 14:19:47 +01:00 · 590407fbce
commit 590407fbce
parent 62ac7860ef
20 changed files with 638 additions and 201 deletions
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.Exceptions.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.Exceptions.xsd
@ -0,0 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:import namespace="http://schemas.datacontract.org/2004/07/System" />
  <xs:complexType name="UnexpectedErrorFault">
    <xs:complexContent mixed="false">
      <xs:extension base="tns:BaseFault">
        <xs:sequence />
      </xs:extension>
    </xs:complexContent>
  </xs:complexType>
  <xs:element name="UnexpectedErrorFault" nillable="true" type="tns:UnexpectedErrorFault" />
  <xs:complexType name="BaseFault">
    <xs:sequence>
      <xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
      <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="InnerException" nillable="true" type="q1:Exception" />
      <xs:element minOccurs="0" name="IsRecoverable" type="xs:boolean" />
    </xs:sequence>
  </xs:complexType>
  <xs:element name="BaseFault" nillable="true" type="tns:BaseFault" />
  <xs:complexType name="DataTableDoesNotExistFault">
    <xs:complexContent mixed="false">
      <xs:extension base="tns:BaseFault">
        <xs:sequence />
      </xs:extension>
    </xs:complexContent>
  </xs:complexType>
  <xs:element name="DataTableDoesNotExistFault" nillable="true" type="tns:DataTableDoesNotExistFault" />
  <xs:complexType name="ObjectDoesNotExistFault">
    <xs:complexContent mixed="false">
      <xs:extension base="tns:BaseFault">
        <xs:sequence />
      </xs:extension>
    </xs:complexContent>
  </xs:complexType>
  <xs:element name="ObjectDoesNotExistFault" nillable="true" type="tns:ObjectDoesNotExistFault" />
 </xs:schema>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@ -4,6 +4,7 @@
    <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.Exceptions" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Messages" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
      <xsd:import namespace="http://schemas.datacontract.org/2004/07/System.Data" />
@ -23,66 +24,102 @@
  <wsdl:message name="IEDMIService_ReturnDatatableFromCache_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatableFromCacheResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatableFromCache_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q1="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q1:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatableFromCache_DataTableDoesNotExistFaultFault_FaultMessage">
    <wsdl:part xmlns:q2="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q2:DataTableDoesNotExistFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_Firebird_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_Firebird" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_Firebird_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_FirebirdResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_Firebird_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q3="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q3:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_Firebird_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_Firebird" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_Firebird_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_FirebirdResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_Firebird_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q4="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q4:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_Firebird_InputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_Firebird" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_Firebird_OutputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_FirebirdResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_Firebird_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q5="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q5:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_IDB_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_IDB" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_IDB_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_IDBResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q6="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q6:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_IDB_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_IDB" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_IDB_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_IDBResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q7="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q7:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_IDB_InputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_IDB" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_IDB_OutputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_IDBResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q8="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q8:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_ECM_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_ECM" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_ECM_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnDatatable_MSSQL_ECMResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnDatatable_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q9="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q9:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_ECM_InputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_ECM" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_ECM_OutputMessage">
    <wsdl:part name="parameters" element="tns:ReturnScalar_MSSQL_ECMResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ReturnScalar_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q10="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q10:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_InputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_ECM" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage">
    <wsdl:part name="parameters" element="tns:ExecuteNonQuery_MSSQL_ECMResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q11="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q11:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="DocumentImportRequest">
    <wsdl:part name="parameters" element="tns:DocumentImportRequest" />
  </wsdl:message>
  <wsdl:message name="DocumentImportResponse">
    <wsdl:part name="parameters" element="tns:DocumentImportResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q12="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q12:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="DocumentStreamRequest">
    <wsdl:part name="parameters" element="tns:DocumentStreamRequest" />
  </wsdl:message>
@ -92,16 +129,28 @@
  <wsdl:message name="DocumentStreamResponse_Headers">
    <wsdl:part name="FileName" element="tns:FileName" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileByObjectId_ObjectDoesNotExistFaultFault_FaultMessage">
    <wsdl:part xmlns:q13="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q13:ObjectDoesNotExistFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileByObjectId_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q14="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q14:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="DocumentInfoRequest">
    <wsdl:part name="parameters" element="tns:DocumentInfoRequest" />
  </wsdl:message>
  <wsdl:message name="DocumentInfoResponse">
    <wsdl:part name="parameters" element="tns:DocumentInfoResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_GetFileInfoByObjectId_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q15="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q15:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ListFilesForUser_InputMessage" />
  <wsdl:message name="DocumentListResponse">
    <wsdl:part name="parameters" element="tns:DocumentListResponse" />
  </wsdl:message>
  <wsdl:message name="IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
  </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" />
@ -110,58 +159,74 @@
    <wsdl:operation name="ReturnDatatableFromCache">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache" message="tns:IEDMIService_ReturnDatatableFromCache_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResponse" message="tns:IEDMIService_ReturnDatatableFromCache_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnDatatableFromCache_UnexpectedErrorFaultFault_FaultMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheDataTableDoesNotExistFaultFault" name="DataTableDoesNotExistFaultFault" message="tns:IEDMIService_ReturnDatatableFromCache_DataTableDoesNotExistFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_Firebird">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird" message="tns:IEDMIService_ReturnDatatable_Firebird_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResponse" message="tns:IEDMIService_ReturnDatatable_Firebird_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnDatatable_Firebird_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_Firebird">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird" message="tns:IEDMIService_ReturnScalar_Firebird_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdResponse" message="tns:IEDMIService_ReturnScalar_Firebird_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnScalar_Firebird_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_Firebird">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird" message="tns:IEDMIService_ExecuteNonQuery_Firebird_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResponse" message="tns:IEDMIService_ExecuteNonQuery_Firebird_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ExecuteNonQuery_Firebird_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_MSSQL_IDB">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB" message="tns:IEDMIService_ReturnDatatable_MSSQL_IDB_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBResponse" message="tns:IEDMIService_ReturnDatatable_MSSQL_IDB_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnDatatable_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_MSSQL_IDB">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB" message="tns:IEDMIService_ReturnScalar_MSSQL_IDB_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBResponse" message="tns:IEDMIService_ReturnScalar_MSSQL_IDB_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnScalar_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_MSSQL_IDB">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_IDB_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_IDB_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_IDB_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_MSSQL_ECM">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM" message="tns:IEDMIService_ReturnDatatable_MSSQL_ECM_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMResponse" message="tns:IEDMIService_ReturnDatatable_MSSQL_ECM_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnDatatable_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_MSSQL_ECM">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM" message="tns:IEDMIService_ReturnScalar_MSSQL_ECM_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMResponse" message="tns:IEDMIService_ReturnScalar_MSSQL_ECM_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ReturnScalar_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_MSSQL_ECM">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMResponse" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_OutputMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ExecuteNonQuery_MSSQL_ECM_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" name="DocumentImportRequest" message="tns:DocumentImportRequest" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse" name="DocumentImportResponse" message="tns:DocumentImportResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFile_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetFileByObjectId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" name="DocumentStreamRequest" message="tns:DocumentStreamRequest" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse" name="DocumentStreamResponse" message="tns:DocumentStreamResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdObjectDoesNotExistFaultFault" name="ObjectDoesNotExistFaultFault" message="tns:IEDMIService_GetFileByObjectId_ObjectDoesNotExistFaultFault_FaultMessage" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_GetFileByObjectId_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="GetFileInfoByObjectId">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectId" name="DocumentInfoRequest" message="tns:DocumentInfoRequest" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectIdResponse" name="DocumentInfoResponse" message="tns:DocumentInfoResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectIdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_GetFileInfoByObjectId_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
    <wsdl:operation name="ListFilesForUser">
      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser" message="tns:IEDMIService_ListFilesForUser_InputMessage" />
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
  </wsdl:portType>
 </wsdl:definitions>
--- a/Services/EDMIServiceReference/Reference.svcmap
+++ b/Services/EDMIServiceReference/Reference.svcmap
@ -29,6 +29,7 @@
    <MetadataFile FileName="DigitalData.Services.EDMIService.Messages.xsd" MetadataType="Schema" ID="e5cf75a6-ec46-4c8a-867b-a1c0a9ce8894" 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.Services.EDMIService.Exceptions.xsd" MetadataType="Schema" ID="57cf2e83-7c36-485a-90c3-0bc4a1748882" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="Message.xsd" MetadataType="Schema" ID="2589e82f-d68f-4843-b153-a80edf895f82" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
    <MetadataFile FileName="DigitalData.Modules.EDMI.API.xsd" MetadataType="Schema" ID="4eca5a54-795a-4e5b-a3b1-10c24930efec" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9000/DigitalData/Services/Main/mex" />
  </Metadata>
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@ -92,6 +92,11 @@ Namespace EDMIServiceReference
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.NonQueryResult)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.DBNull)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(System.Exception)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.BaseFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DataTableDoesNotExistFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ObjectDoesNotExistFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.RightsAccessRight))>  _
    Partial Public Class ScalarResult
        Inherits EDMIServiceReference.BaseResult
@ -147,6 +152,116 @@ Namespace EDMIServiceReference
        End Property
    End Class
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
        "ns"),  _
     System.SerializableAttribute()>  _
    Partial Public Class UnexpectedErrorFault
        Inherits EDMIServiceReference.BaseFault
    End Class
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="BaseFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
        "ns"),  _
     System.SerializableAttribute(),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.DataTableDoesNotExistFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.ObjectDoesNotExistFault)),  _
     System.Runtime.Serialization.KnownTypeAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault))>  _
    Partial Public Class BaseFault
        Inherits Object
        Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
        <System.NonSerializedAttribute()>  _
        Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private ErrorMessageField As String
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private InnerExceptionField As System.Exception
        <System.Runtime.Serialization.OptionalFieldAttribute()>  _
        Private IsRecoverableField As Boolean
        <Global.System.ComponentModel.BrowsableAttribute(false)>  _
        Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData
            Get
                Return Me.extensionDataField
            End Get
            Set
                Me.extensionDataField = value
            End Set
        End Property
        <System.Runtime.Serialization.DataMemberAttribute()>  _
        Public Property ErrorMessage() As String
            Get
                Return Me.ErrorMessageField
            End Get
            Set
                If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then
                    Me.ErrorMessageField = value
                    Me.RaisePropertyChanged("ErrorMessage")
                End If
            End Set
        End Property
        <System.Runtime.Serialization.DataMemberAttribute()>  _
        Public Property InnerException() As System.Exception
            Get
                Return Me.InnerExceptionField
            End Get
            Set
                If (Object.ReferenceEquals(Me.InnerExceptionField, value) <> true) Then
                    Me.InnerExceptionField = value
                    Me.RaisePropertyChanged("InnerException")
                End If
            End Set
        End Property
        <System.Runtime.Serialization.DataMemberAttribute()>  _
        Public Property IsRecoverable() As Boolean
            Get
                Return Me.IsRecoverableField
            End Get
            Set
                If (Me.IsRecoverableField.Equals(value) <> true) Then
                    Me.IsRecoverableField = value
                    Me.RaisePropertyChanged("IsRecoverable")
                End If
            End Set
        End Property
        Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged
        Protected Sub RaisePropertyChanged(ByVal propertyName As String)
            Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent
            If (Not (propertyChanged) Is Nothing) Then
                propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName))
            End If
        End Sub
    End Class
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="DataTableDoesNotExistFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
        "ns"),  _
     System.SerializableAttribute()>  _
    Partial Public Class DataTableDoesNotExistFault
        Inherits EDMIServiceReference.BaseFault
    End Class
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="ObjectDoesNotExistFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
        "ns"),  _
     System.SerializableAttribute()>  _
    Partial Public Class ObjectDoesNotExistFault
        Inherits EDMIServiceReference.BaseFault
    End Class
    <System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"),  _
     System.Runtime.Serialization.DataContractAttribute(Name:="Rights.AccessRight", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Modules.EDMI.API")>  _
    Public Enum RightsAccessRight As Integer
@ -172,7 +287,13 @@ Namespace EDMIServiceReference
        Function HeartbeatAsync() As System.Threading.Tasks.Task(Of Boolean)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResp"& _ 
-            "onse")>  _
+            "onse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheUnex"& _ 
            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.DataTableDoesNotExistFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheData"& _ 
            "TableDoesNotExistFaultFault", Name:="DataTableDoesNotExistFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnDatatableFromCache(ByVal Name As String, ByVal FilterExpression As String, ByVal SortByColumn As String) As EDMIServiceReference.TableResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCache", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatableFromCacheResp"& _ 
@ -180,7 +301,10 @@ Namespace EDMIServiceReference
        Function ReturnDatatableFromCacheAsync(ByVal Name As String, ByVal FilterExpression As String, ByVal SortByColumn As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResp"& _ 
-            "onse")>  _
+            "onse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdUnex"& _ 
            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnDatatable_Firebird(ByVal SQL As String) As EDMIServiceReference.TableResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_FirebirdResp"& _ 
@ -188,7 +312,10 @@ Namespace EDMIServiceReference
        Function ReturnDatatable_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdRespons"& _ 
-            "e")>  _
+            "e"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdUnexpec"& _ 
            "tedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnScalar_Firebird(ByVal SQL As String) As EDMIServiceReference.ScalarResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_FirebirdRespons"& _ 
@ -196,7 +323,10 @@ Namespace EDMIServiceReference
        Function ReturnScalar_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResp"& _ 
-            "onse")>  _
+            "onse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdUnex"& _ 
            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ExecuteNonQuery_Firebird(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_FirebirdResp"& _ 
@ -204,7 +334,10 @@ Namespace EDMIServiceReference
        Function ExecuteNonQuery_FirebirdAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBRes"& _ 
-            "ponse")>  _
+            "ponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBUne"& _ 
            "xpectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnDatatable_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.TableResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDBRes"& _ 
@ -212,7 +345,10 @@ Namespace EDMIServiceReference
        Function ReturnDatatable_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBRespon"& _ 
-            "se")>  _
+            "se"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBUnexpe"& _ 
            "ctedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnScalar_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.ScalarResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDBRespon"& _ 
@ -220,7 +356,10 @@ Namespace EDMIServiceReference
        Function ReturnScalar_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBRes"& _ 
-            "ponse")>  _
+            "ponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBUne"& _ 
            "xpectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ExecuteNonQuery_MSSQL_IDB(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDBRes"& _ 
@ -228,7 +367,10 @@ Namespace EDMIServiceReference
        Function ExecuteNonQuery_MSSQL_IDBAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMRes"& _ 
-            "ponse")>  _
+            "ponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMUne"& _ 
            "xpectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnDatatable_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.TableResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECMRes"& _ 
@ -236,7 +378,10 @@ Namespace EDMIServiceReference
        Function ReturnDatatable_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.TableResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMRespon"& _ 
-            "se")>  _
+            "se"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMUnexpe"& _ 
            "ctedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ReturnScalar_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.ScalarResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECMRespon"& _ 
@ -244,7 +389,10 @@ Namespace EDMIServiceReference
        Function ReturnScalar_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ScalarResult)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMRes"& _ 
-            "ponse")>  _
+            "ponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMUne"& _ 
            "xpectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ExecuteNonQuery_MSSQL_ECM(ByVal SQL As String) As EDMIServiceReference.NonQueryResult
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECMRes"& _ 
@ -252,21 +400,33 @@ Namespace EDMIServiceReference
        Function ExecuteNonQuery_MSSQL_ECMAsync(ByVal SQL As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NonQueryResult)
        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportRequest) von Nachricht "DocumentImportRequest" nicht mit dem Standardwert (ImportFile) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileUnexpectedErrorFau"& _ 
            "ltFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ImportFile(ByVal request As EDMIServiceReference.DocumentImportRequest) As EDMIServiceReference.DocumentImportResponse
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileResponse")>  _
        Function ImportFileAsync(ByVal request As EDMIServiceReference.DocumentImportRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportResponse)
        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentStreamRequest) von Nachricht "DocumentStreamRequest" nicht mit dem Standardwert (GetFileByObjectId) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.ObjectDoesNotExistFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdObjectDoesN"& _ 
            "otExistFaultFault", Name:="ObjectDoesNotExistFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdUnexpectedE"& _ 
            "rrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function GetFileByObjectId(ByVal request As EDMIServiceReference.DocumentStreamRequest) As EDMIServiceReference.DocumentStreamResponse
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectIdResponse")>  _
        Function GetFileByObjectIdAsync(ByVal request As EDMIServiceReference.DocumentStreamRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentStreamResponse)
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectIdRespons"& _ 
-            "e")>  _
+            "e"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectIdUnexpec"& _ 
            "tedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function GetFileInfoByObjectId(ByVal request As EDMIServiceReference.DocumentInfoRequest) As EDMIServiceReference.DocumentInfoResponse
        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Vorgang mehrere Rückgabewerte aufweist.
@ -275,7 +435,10 @@ Namespace EDMIServiceReference
        Function GetFileInfoByObjectIdAsync(ByVal request As EDMIServiceReference.DocumentInfoRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentInfoResponse)
        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Vorgang ListFilesForUser weder in RPC noch in einem Dokument eingeschlossen ist.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse"),  _
         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserUnexpectedEr"& _ 
            "rorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
        Function ListFilesForUser(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As EDMIServiceReference.DocumentListResponse
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
--- a/Services/EDMIServiceReference/System.xsd
+++ b/Services/EDMIServiceReference/System.xsd
@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/System" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:tns="http://schemas.datacontract.org/2004/07/System" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
  <xs:complexType name="DBNull">
    <xs:sequence />
  </xs:complexType>
  <xs:element name="DBNull" nillable="true" type="tns:DBNull" />
  <xs:complexType name="Exception">
    <xs:sequence>
      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##local" processContents="skip" />
    </xs:sequence>
    <xs:attribute ref="ser:FactoryType" />
  </xs:complexType>
  <xs:element name="Exception" nillable="true" type="tns:Exception" />
 </xs:schema>
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@ -58,6 +58,12 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
      <wsdl:fault name="DataTableDoesNotExistFaultFault">
        <soap12:fault use="literal" name="DataTableDoesNotExistFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_Firebird">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_Firebird" style="document" />
@ -67,6 +73,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_Firebird">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_Firebird" style="document" />
@ -76,6 +85,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_Firebird">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_Firebird" style="document" />
@ -85,6 +97,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_MSSQL_IDB">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_IDB" style="document" />
@ -94,6 +109,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_MSSQL_IDB">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_IDB" style="document" />
@ -103,6 +121,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_MSSQL_IDB">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_IDB" style="document" />
@ -112,6 +133,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnDatatable_MSSQL_ECM">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnDatatable_MSSQL_ECM" style="document" />
@ -121,6 +145,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ReturnScalar_MSSQL_ECM">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ReturnScalar_MSSQL_ECM" style="document" />
@ -130,6 +157,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ExecuteNonQuery_MSSQL_ECM">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ExecuteNonQuery_MSSQL_ECM" style="document" />
@ -139,6 +169,9 @@
      <wsdl:output>
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ImportFile">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFile" style="document" />
@ -148,6 +181,9 @@
      <wsdl:output name="DocumentImportResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="GetFileByObjectId">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFileByObjectId" style="document" />
@ -158,6 +194,12 @@
        <soap12:header message="i0:DocumentStreamResponse_Headers" part="FileName" use="literal" />
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="ObjectDoesNotExistFaultFault">
        <soap12:fault use="literal" name="ObjectDoesNotExistFaultFault" namespace="" />
      </wsdl:fault>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="GetFileInfoByObjectId">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/GetFileInfoByObjectId" style="document" />
@ -167,6 +209,9 @@
      <wsdl:output name="DocumentInfoResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
    <wsdl:operation name="ListFilesForUser">
      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser" style="document" />
@ -176,6 +221,9 @@
      <wsdl:output name="DocumentListResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
  </wsdl:binding>
  <wsdl:service name="EDMIService">
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@ -133,6 +133,9 @@
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.xsd">
      <SubType>Designer</SubType>
    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Exceptions.xsd">
      <SubType>Designer</SubType>
    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Services.EDMIService.Messages.xsd">
      <SubType>Designer</SubType>
    </None>
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@ -8,6 +8,7 @@ Imports System.Data.SqlClient
 Imports System.ServiceModel.Description
 Imports DigitalData.Services.EDMIService.Messages
 Imports DigitalData.Modules.EDMI.API.Rights
 Imports DigitalData.Services.EDMIService.Exceptions
 <ServiceBehavior(InstanceContextMode:=InstanceContextMode.PerSession)>
 Public Class EDMIService
@ -23,6 +24,9 @@ Public Class EDMIService
    Public Shared GlobalState As GlobalState
    Public Shared Scheduler As Scheduler
    Public Const TBIDB_DOC_INFO = "TBIDB_DOC_INFO"
    Public Const TBIDB_ACCESSRIGHT = "TBIDB_ACCESSRIGHT"
    Private ReadOnly _Logger As Logger
    Private ReadOnly _Debug As Boolean = False
    Private ReadOnly _Username As String
@ -100,11 +104,20 @@ Public Class EDMIService
                Return New TableResult(oFilteredTable)
            Else
-                Throw New ApplicationException($"DataTable {Name} does not exist")
+                _Logger.Warn($"Datatable {Name} does not exist")
                Dim oDetails As New DataTableDoesNotExistFault(Name)
                Throw New FaultException(Of DataTableDoesNotExistFault)(oDetails)
            End If
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Throw New FaultException(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
 #End Region
@ -115,9 +128,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnDatatable_MSSQL_IDB, SQL: {SQL}")
            Dim oResult As DataTable = MSSQL_IDB.GetDatatable(SQL)
            Return New TableResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New TableResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -126,9 +146,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnScalar_MSSQL_IDB, SQL: {SQL}")
            Dim oResult As Object = MSSQL_IDB.GetScalarValue(SQL)
            Return New ScalarResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New ScalarResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -137,9 +164,16 @@ Public Class EDMIService
            _Logger.Info($"ExecuteNonQuery_MSSQL_IDB, SQL: {SQL}")
            Dim oResult As Boolean = MSSQL_IDB.ExecuteNonQuery(SQL)
            Return New NonQueryResult()
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New NonQueryResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
 #End Region
@ -150,9 +184,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnDatatable_MSSQL_ECM, SQL: {SQL}")
            Dim oResult As DataTable = MSSQL_ECM.GetDatatable(SQL)
            Return New TableResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New TableResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -161,9 +202,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnScalar_MSSQL_ECM, SQL: {SQL}")
            Dim oResult As Object = MSSQL_ECM.GetScalarValue(SQL)
            Return New ScalarResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New ScalarResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -172,9 +220,16 @@ Public Class EDMIService
            _Logger.Info($"ExecuteNonQuery_MSSQL_ECM, SQL: {SQL}")
            Dim oResult As Boolean = MSSQL_ECM.ExecuteNonQuery(SQL)
            Return New NonQueryResult()
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New NonQueryResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
 #End Region
@ -185,9 +240,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnDatatable, SQL: {SQL}")
            Dim oResult As DataTable = Firebird.GetDatatable(SQL)
            Return New TableResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New TableResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -196,9 +258,16 @@ Public Class EDMIService
            _Logger.Info($"ReturnScalar, SQL: {SQL}")
            Dim oResult As Object = Firebird.GetScalarValue(SQL)
            Return New ScalarResult(oResult)
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New ScalarResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
@ -207,9 +276,16 @@ Public Class EDMIService
            _Logger.Info($"ExecuteNonQuery, SQL: {SQL}")
            Dim oResult As Boolean = Firebird.ExecuteNonQuery(SQL)
            Return New NonQueryResult()
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Return New NonQueryResult(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
 #End Region
@ -220,14 +296,7 @@ Public Class EDMIService
    ''' </summary>
    ''' <returns></returns>
    Public Function ImportFile(Data As DocumentImportRequest) As DocumentImportResponse Implements IEDMIService.ImportFile
-        Dim oObjectStore = GlobalState.ObjectStores.
+        Dim oObjectStore = GlobalState.ObjectStores.First()
            Where(Function(s) s.Id = Data.ObjectStoreId).
            FirstOrDefault()
        If oObjectStore Is Nothing Then
            Throw New FaultException($"Object Store with Id [{Data.ObjectStoreId}] does not exist!")
        End If
        Dim EDMIPath = New EDMI.File.Path(LogConfig, oObjectStore.Path)
        ' TODO: 
@ -244,12 +313,7 @@ Public Class EDMIService
        Try
            Directory.CreateDirectory(oDirectoryPath)
        Catch ex As Exception
            _Logger.Error(ex)
            Throw New FaultException(ex.Message)
        End Try
        Try
            Dim oVersionedFileName As String = Filesystem.GetVersionedFilename(oAbsolutePath)
            _Logger.Info("ImportFile: Saving file [{0}] to path [{1}]", Data.FileName, oVersionedFileName)
@ -270,37 +334,37 @@ Public Class EDMIService
            Dim oObjectId = MSSQL_IDB.GetScalarValue(oCommand, "@IDB_OBJ_ID")
            Return New DocumentImportResponse() With {.ObjectId = oObjectId}
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Throw New FaultException(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
    Public Function GetFileByObjectId(Data As DocumentStreamRequest) As DocumentStreamResponse Implements IEDMIService.GetFileByObjectId
        Try
-            Dim oSQL As String = $"SELECT ObjectStoreId FROM VWIDB_DOC_DATA WHERE IDB_OBJ_ID = {Data.ObjectId}"
+            Dim oFullPath = GetFullPathForObjectId(Data.ObjectId)
            Dim oObjectStoreId = MSSQL_IDB.GetScalarValue(oSQL)
-            Dim oObjectStore = GlobalState.ObjectStores.
+            If oFullPath = String.Empty Then
-                Where(Function(s) s.Id = oObjectStoreId).
+                Dim oDetails As New ObjectDoesNotExistFault(Data.ObjectId)
-                FirstOrDefault()
+                _Logger.Warn("GetFileByObjectId: " & oDetails.ErrorMessage)
-
+                Throw New FaultException(Of ObjectDoesNotExistFault)(oDetails, oDetails.ErrorMessage)
            Dim oSQL2 As String = $"SELECT DocRelativePath FROM VWIDB_DOC_DATA WHERE IDB_OBJ_ID = {Data.ObjectId}"
            Dim oPath As String = MSSQL_IDB.GetScalarValue(oSQL2)
            If IsNothing(oPath) Then
                Throw New FaultException($"Object [{Data.ObjectId}] does not exist in database!")
            End If
            Dim EDMIPath As New EDMI.File.Path(LogConfig, oObjectStore.Path)
            Dim oFullPath = EDMIPath.GetFullPathFromRelativePath(oPath)
            _Logger.Debug("GetFileByObjectId: Loading file [{0}]", oFullPath)
            Dim oFileInfo As New FileInfo(oFullPath)
            If Not oFileInfo.Exists Then
-                Throw New FaultException($"Object [{Data.ObjectId}] does not exist on filesystem!")
+                Dim oDetails As New ObjectDoesNotExistFault(Data.ObjectId)
                _Logger.Warn("GetFileByObjectId: " & oDetails.ErrorMessage)
                Throw New FaultException(Of ObjectDoesNotExistFault)(oDetails, oDetails.ErrorMessage)
            End If
            Dim oDestination As New MemoryStream()
@ -309,109 +373,145 @@ Public Class EDMIService
            End Using
            oDestination.Seek(0, SeekOrigin.Begin)
-            Dim oMessage As New Messages.DocumentStreamResponse() With {
+            Dim oMessage As New DocumentStreamResponse() With {
                .FileName = oFileInfo.Name,
                .FileContents = oDestination
            }
            Return oMessage
-        Catch ex As IOException
+        Catch ex As FaultException
            _Logger.Error(ex)
-            Throw New FaultException($"Object [{Data.ObjectId}] could not be streamed!")
+            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Throw New FaultException(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
    Public Function ListFilesForUser() As DocumentListResponse Implements IEDMIService.ListFilesForUser
        Try
-            Dim oSQL = $"SELECT * FROM VWIDB_DOC_DATA"
+            Dim oDatatable = GetFileList()
            Dim oDatatable As DataTable = MSSQL_IDB.GetDatatable(oSQL)
            oDatatable.TableName = "DocumentList"
            Return New DocumentListResponse() With {
                .Datatable = oDatatable
            }
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Throw New FaultException(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
    Public Function GetFileInfoByObjectId(Data As DocumentInfoRequest) As DocumentInfoResponse Implements IEDMIService.GetFileInfoByObjectId
        Try
-            Dim oAccessRight = GetAccessRight(Data.UserId, Data.ObjectId)
+            Dim oAccessRight = GetAccessRightForObjectId(Data.UserId, Data.ObjectId)
-            Dim oFullPath = GetFullPath(Data.ObjectId)
+            Dim oFullPath = GetFullPathForObjectId(Data.ObjectId)
            If oFullPath = String.Empty Then
                Dim oDetails As New ObjectDoesNotExistFault(Data.ObjectId)
                Throw New FaultException(Of ObjectDoesNotExistFault)(oDetails)
            End If
            Return New DocumentInfoResponse With {
                .FileRight = oAccessRight,
                .FullPath = oFullPath
            }
        Catch ex As FaultException
            _Logger.Error(ex)
            Throw ex
        Catch ex As Exception
            _Logger.Error(ex)
-            Throw New FaultException(ex.Message)
+            Dim oDetails As New UnexpectedErrorFault(ex)
            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
        End Try
    End Function
-    Private Function GetFullPath(ObjectId As Long) As String
+    Public Function GetFileList() As DataTable
-        Dim oTableName As String = "TBIDB_DOC_INFO"
+        Try
-
+            If Not GlobalState.TableStore.Tables.Contains(TBIDB_DOC_INFO) Then
-        If Not GlobalState.TableStore.Tables.Contains(oTableName) Then
+                _Logger.Warn("GetFileList: Document info table does not exist!")
-            _Logger.Warn("GetFullPath: Document info table does not exist!")
+                Return Nothing
            Return String.Empty
        End If
        Dim oTable As DataTable = GlobalState.TableStore.Tables.Item(oTableName)
        Dim oRows As List(Of DataRow) = oTable.Select($"IDB_OBJ_ID = {ObjectId}").ToList()
        Dim oFullPath As String
        If oRows.Count = 0 Then
            _Logger.Warn("GetFullPath: Full path does not exist for on object [{1}]", ObjectId)
            oFullPath = String.Empty
        Else
            Dim oRow As DataRow = oRows.First()
            oFullPath = oRow.Item("FULL_PATH")
        End If
        Return oFullPath
    End Function
    Private Function GetAccessRight(UserId As Long, ObjectId As Long) As AccessRight
        Dim oTableName As String = "TBIDB_ACCESSRIGHT"
        If Not GlobalState.TableStore.Tables.Contains(oTableName) Then
            _Logger.Warn("GetAccessRight: Access right table does not exist!")
            Return AccessRight.VIEW_ONLY
        End If
        Dim oTable As DataTable = GlobalState.TableStore.Tables.Item(oTableName)
        Dim oRows As List(Of DataRow) = oTable.Select($"IDB_OBJ_ID = {ObjectId} AND USR_ID = {UserId}").ToList()
        Dim oRight As AccessRight = AccessRight.VIEW_ONLY
        If oRows.Count = 0 Then
            _Logger.Warn("GetAccessRight: Access right assignment does not exist for user [{0}] on object [{1}]", UserId, ObjectId)
            Return AccessRight.VIEW_ONLY
        Else
            If oRows.Count > 1 Then
                _Logger.Warn("GetAccessRight: More than one access right assignment found for user [{0}] on object [{1}]", UserId, ObjectId)
            End If
-            Dim oRow As DataRow = oRows.First()
+            Dim oTable As DataTable = GlobalState.TableStore.Tables.Item(TBIDB_DOC_INFO)
-            Dim oRightAsInt = oRow.Item("ACCESSRIGHT")
+            Return oTable
        Catch ex As Exception
            _Logger.Warn("GetFileList: Unexpected Error while getting file list.")
            _Logger.Error(ex)
            Return Nothing
        End Try
    End Function
    Private Function GetFullPathForObjectId(ObjectId As Long) As String
        Try
            If Not GlobalState.TableStore.Tables.Contains(TBIDB_DOC_INFO) Then
                _Logger.Warn("GetFullPathForObjectId: Document info table does not exist!")
                Return String.Empty
            End If
-            oRight = Utils.ToEnum(Of AccessRight)(oRightAsInt)
+            Dim oTable As DataTable = GlobalState.TableStore.Tables.Item(TBIDB_DOC_INFO)
-        End If
+            Dim oRows As List(Of DataRow) = oTable.Select($"IDB_OBJ_ID = {ObjectId}").ToList()
-        Return oRight
+            Dim oFullPath As String
            If oRows.Count = 0 Then
                _Logger.Warn("GetFullPathForObjectId: Full path does not exist for on object [{1}]", ObjectId)
                oFullPath = String.Empty
            Else
                Dim oRow As DataRow = oRows.First()
                oFullPath = oRow.Item("FULL_PATH")
            End If
            Return oFullPath
        Catch ex As Exception
            _Logger.Warn("GetFullPathForObjectId: Unexpected Error while getting full path for object  [{0}].", ObjectId)
            _Logger.Error(ex)
            Return String.Empty
        End Try
    End Function
    Private Function GetAccessRightForObjectId(UserId As Long, ObjectId As Long) As AccessRight
        Try
            If Not GlobalState.TableStore.Tables.Contains(TBIDB_ACCESSRIGHT) Then
                _Logger.Warn("GetAccessRightForObjectId: Access right table does not exist!")
                Return AccessRight.VIEW_ONLY
            End If
            Dim oTable As DataTable = GlobalState.TableStore.Tables.Item(TBIDB_ACCESSRIGHT)
            Dim oRows As List(Of DataRow) = oTable.Select($"IDB_OBJ_ID = {ObjectId} AND USR_ID = {UserId}").ToList()
            Dim oRight As AccessRight
            If oRows.Count = 0 Then
                _Logger.Warn("GetAccessRightForObjectId: Access right assignment does not exist for user [{0}] on object [{1}]", UserId, ObjectId)
                Return AccessRight.VIEW_ONLY
            Else
                If oRows.Count > 1 Then
                    _Logger.Warn("GetAccessRightForObjectId: More than one access right assignment found for user [{0}] on object [{1}]", UserId, ObjectId)
                End If
                Dim oRow As DataRow = oRows.First()
                Dim oRightAsInt = oRow.Item("ACCESSRIGHT")
                oRight = Utils.ToEnum(Of AccessRight)(oRightAsInt)
            End If
            Return oRight
        Catch ex As Exception
            _Logger.Warn("GetAccessRightForObjectId: Unexpected Error while getting access right for object [{0}].", ObjectId)
            _Logger.Error(ex)
            Return AccessRight.VIEW_ONLY
        End Try
    End Function
 #End Region
 End Class
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@ -126,14 +126,13 @@
  <ItemGroup>
    <Compile Include="Config.vb" />
    <Compile Include="GlobalState.vb" />
-    <Compile Include="Results.vb" />
+    <Compile Include="Helpers\AccessRightResult.vb" />
-    <Compile Include="Results\AccessRightResult.vb" />
+    <Compile Include="Helpers\Messages.vb" />
-    <Compile Include="Results\Messages.vb" />
+    <Compile Include="Helpers\BaseResult.vb" />
-    <Compile Include="Results\BaseResult.vb" />
+    <Compile Include="Helpers\Exceptions.vb" />
-    <Compile Include="Exceptions.vb" />
+    <Compile Include="Helpers\DatabaseResult.vb" />
    <Compile Include="Results\DatabaseResult.vb" />
    <Compile Include="EDMIService.vb" />
-    <Compile Include="Scheduler.vb" />
+    <Compile Include="Scheduler\Scheduler.vb" />
    <Compile Include="Scheduler\DatatableJob.vb" />
    <Compile Include="Scheduler\JobListener.vb" />
    <Compile Include="Scheduler\JobResult.vb" />
--- a/Service.EDMIService/Exceptions.vb
+++ b/Service.EDMIService/Exceptions.vb
@ -1,13 +0,0 @@
 Imports System.ServiceModel
 Public Class Exceptions
    Public Class BaseException
        Inherits FaultException
    End Class
    Public Class NoRequestException
        Inherits BaseException
    End Class
 End Class
--- a/Service.EDMIService/Helpers/AccessRightResult.vb
+++ b/Service.EDMIService/Helpers/AccessRightResult.vb
--- a/Service.EDMIService/Helpers/BaseResult.vb
+++ b/Service.EDMIService/Helpers/BaseResult.vb
--- a/Service.EDMIService/Helpers/DatabaseResult.vb
+++ b/Service.EDMIService/Helpers/DatabaseResult.vb
--- a/Service.EDMIService/Helpers/Exceptions.vb
+++ b/Service.EDMIService/Helpers/Exceptions.vb
@ -0,0 +1,71 @@
 Imports System.Runtime.Serialization
 Imports System.ServiceModel
 Namespace Exceptions
    Public Class UnexpectedErrorException(Of UnexpectedErrorFault)
        Inherits FaultException
        Public Sub New()
            MyBase.New()
        End Sub
    End Class
    <DataContract>
    Public Class BaseFault
        ''' <summary>
        ''' The human readable error message
        ''' </summary>
        <DataMember>
        Public Property ErrorMessage As String
        <DataMember>
        Public Property InnerException As Exception
        <DataMember>
        Public Property IsRecoverable As Boolean = True
    End Class
    <DataContract>
    Public Class UnexpectedErrorFault
        Inherits BaseFault
        Public Sub New(Exception As Exception)
            MyBase.New()
            ErrorMessage = "Unexpected Error"
            IsRecoverable = True
            InnerException = Exception
        End Sub
    End Class
    <DataContract>
    Public Class DataTableDoesNotExistFault
        Inherits BaseFault
        Public Sub New(Name As String)
            MyBase.New()
            ErrorMessage = $"Datatable {Name} does not exist"
            IsRecoverable = True
            InnerException = Nothing
        End Sub
    End Class
    <DataContract>
    Public Class ObjectDoesNotExistFault
        Inherits BaseFault
        Public Sub New(ObjectId As Long)
            MyBase.New()
            ErrorMessage = $"Object with Id {ObjectId} does not exist"
            IsRecoverable = True
            InnerException = Nothing
        End Sub
    End Class
 End Namespace
--- a/Service.EDMIService/Helpers/Messages.vb
+++ b/Service.EDMIService/Helpers/Messages.vb
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/IEDMIService.vb
@ -1,8 +1,8 @@
 Imports System.IO
 Imports System.ServiceModel
 Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Services.EDMIService.Exceptions
 Imports DigitalData.Services.EDMIService.Messages
 Imports DigitalData.Services.EDMIService.Results
 <ServiceContract(Name:="IEDMIService", [Namespace]:="http://DigitalData.Services.EDMIService")>
 Interface IEDMIService
@ -14,53 +14,69 @@ Interface IEDMIService
 #Region "Database"
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    <FaultContract(GetType(DataTableDoesNotExistFault))>
    Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult
 #End Region
 #Region "Database (Firebird)"
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnDatatable_Firebird(SQL As String) As TableResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnScalar_Firebird(SQL As String) As ScalarResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ExecuteNonQuery_Firebird(SQL As String) As NonQueryResult
 #End Region
 #Region "Database (MSSQL IDB)"
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnDatatable_MSSQL_IDB(SQL As String) As TableResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnScalar_MSSQL_IDB(SQL As String) As ScalarResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ExecuteNonQuery_MSSQL_IDB(SQL As String) As NonQueryResult
 #End Region
 #Region "Database (MSSQL ECM)"
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnDatatable_MSSQL_ECM(SQL As String) As TableResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ReturnScalar_MSSQL_ECM(SQL As String) As ScalarResult
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ExecuteNonQuery_MSSQL_ECM(SQL As String) As NonQueryResult
 #End Region
 #Region "Document (New)"
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ImportFile(Data As DocumentImportRequest) As DocumentImportResponse
    <OperationContract>
    <FaultContract(GetType(ObjectDoesNotExistFault))>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function GetFileByObjectId(Data As DocumentStreamRequest) As DocumentStreamResponse
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function GetFileInfoByObjectId(Data As DocumentInfoRequest) As DocumentInfoResponse
    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
    Function ListFilesForUser() As DocumentListResponse
 #End Region
--- a/Service.EDMIService/Results.vb
+++ b/Service.EDMIService/Results.vb
@ -1,2 +0,0 @@
 Friend Class Results
 End Class
--- a/Service.EDMIService/Scheduler/DatatableJob.vb
+++ b/Service.EDMIService/Scheduler/DatatableJob.vb
@ -64,7 +64,7 @@ Public Class DatatableJob
                        oResultTable.TableRelationColumn = oParentColumn
                    End If
-                    oLogger.Info("Fetched Datatable [{0}]", oDatatableName)
+                    oLogger.Debug("Fetched Datatable [{0}]", oDatatableName)
                    oResult.Tables.Add(oResultTable)
                Catch ex As Exception
                    oLogger.Warn("Execute: Error while saving Table: [{0}]", oDatatableName)
@ -72,6 +72,8 @@ Public Class DatatableJob
                End Try
            Next
            oLogger.Info("Fetched [{0}] Datatables", oResult.Tables.Count)
            '  Das Ergebnis speichern
            context.Result = oResult
@ -81,60 +83,5 @@ Public Class DatatableJob
        End Try
        Return Task.FromResult(True)
 #Region "OLD"
        'Dim oJobData = context.MergedJobDataMap
        'Dim oLogConfig As LogConfig = oJobData.Item("LogConfig")
        'Dim oLogger As Logger = oLogConfig.GetLogger()
        'Dim oDetailRow As DataRow = oJobData.Item("CronJobDetails")
        'Dim oDatatableName As String = NotNull(oDetailRow.Item("DT_NAME"), String.Empty)
        'Try
        '    Dim oCronJobTitle As String = oJobData.Item("CronJobTitle")
        '    Dim oMSSQL As MSSQLServer = oJobData.Item("MSSQL")
        '    Dim oConnectionId As Integer = NotNull(oDetailRow.Item("CON_ID"), String.Empty)
        '    Dim oTitle As String = NotNull(oDetailRow.Item("TITLE"), String.Empty)
        '    Dim oSQL As String = NotNull(oDetailRow.Item("COMMAND"), String.Empty)
        '    oLogger.Debug("Running Command-Job [{0}]", oTitle)
        '    oLogger.Debug("Datatable Name: {0}", oDatatableName)
        '    oLogger.Debug("Connection Id: {0}", oConnectionId)
        '    Dim oConnectionString = oMSSQL.Get_ConnectionStringforID(oConnectionId)
        '    Dim oTable = oMSSQL.GetDatatableWithConnection(oSQL, oConnectionString)
        '    oTable.TableName = oDatatableName
        '    oLogger.Debug("Result Datatable [{0}] contains [{1}] rows", oTable.TableName, oTable.Rows.Count)
        '    Dim oResult = New JobResult() With {
        '        .Table = oTable
        '    }
        '    Dim oChildTableNAme As String = NotNull(oDetailRow.Item("CHILD_DT_NAME"), String.Empty)
        '    If oChildTableNAme <> String.Empty Then
        '        Dim oParentColumn As String = NotNull(oDetailRow.Item("DT_COLUMN"), String.Empty)
        '        Dim oChildColumn As String = NotNull(oDetailRow.Item("CHILD_DT_COLUMN"), String.Empty)
        '        oLogger.Debug("Child Datatable [{0}] defined, Relation: Parent [{1}] -> Child [{2}]", oChildTableName, oParentColumn, oChildColumn)
        '        Dim oChildTable As DataTable = oMSSQL.GetDatatableWithConnection($"SELECT * FROM {oChildTableName}", oConnectionString)
        '        oChildTable.TableName = oChildTableName
        '        oLogger.Debug("Child Datatable [{0}] contains [{1}] rows", oChildTable.TableName, oChildTable.Rows.Count)
        '        oResult.ChildTable = oChildTable
        '        oResult.ChildRelationColumn = oChildColumn
        '        oResult.TableRelationColumn = oParentColumn
        '    End If
        '    ' Das Ergebnis speichern
        '    context.Result = oResult
        'Catch ex As Exception
        '    oLogger.Error(ex)
        '    oLogger.Warn("Unhandled exception while executing SQL for Datatable {0}", oDatatableName)
        'End Try
        'Return Task.FromResult(True)
 #End Region
    End Function
 End Class
--- a/Service.EDMIService/Scheduler/JobListener.vb
+++ b/Service.EDMIService/Scheduler/JobListener.vb
@ -167,8 +167,8 @@ Public Class JobListener
            Dim oDatatableNameTemp As String = oName & "-TEMP"
            ' Used for debugging relations and constraints
-            _Logger.Debug("Dataset BEFORE saving datatables")
+            '_Logger.Debug("Dataset BEFORE saving datatables")
-            ListTables(Dataset)
+            'ListTables(Dataset)
            If Dataset.Tables.Contains(oName) Then
                ' Replace existing table
@ -193,14 +193,9 @@ Public Class JobListener
                _Logger.Debug(oDataTable.TableName)
            Next
            _Logger.Debug("Listing Relations in Dataset")
            For Each oRelation As DataRelation In Dataset.Relations
                _Logger.Debug(oRelation.RelationName)
            Next
            ' Used for debugging relations and constraints
-            _Logger.Debug("Dataset AFTER saving datatables")
+            '_Logger.Debug("Dataset AFTER saving datatables")
-            ListTables(Dataset)
+            'ListTables(Dataset)
            _MSSQL.ExecuteNonQuery($"INSERT INTO TBAPPSERV_CRON_DETAIL_HISTORY (DETAIL_ID) VALUES ({oDetailId})")
        Catch ex As Exception
--- a/Service.EDMIService/Scheduler/Scheduler.vb
+++ b/Service.EDMIService/Scheduler/Scheduler.vb