diff --git a/Service.EDMIService/App.config b/Service.EDMIService/App.config
index 90304c22..511006d2 100644
--- a/Service.EDMIService/App.config
+++ b/Service.EDMIService/App.config
@@ -4,10 +4,7 @@
   </configSections>
   <system.diagnostics>
     <sources>
-      <source name="System.ServiceModel" 
-              switchValue="Warning"
-              switchType="DigitalData.Services.EDMIService.TraceSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"
-              propagateActivity="true">
+      <source name="System.ServiceModel" switchValue="Warning" switchType="DigitalData.Services.EDMIService.TraceSwitch, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" propagateActivity="true">
         <listeners>
           <add name="xml" />
         </listeners>
@@ -30,19 +27,8 @@
     </diagnostics>
     <bindings>
       <netTcpBinding>
-        <binding name="tcpBinding"
-                 transferMode="Streamed"
-                 sendTimeout="00:10:00"
-                 receiveTimeout="00:10:00"
-                 maxBufferSize="2147483647"
-                 maxBufferPoolSize="2147483647"
-                 maxReceivedMessageSize="2147483647">
-          <readerQuotas
-            maxDepth="32"
-            maxStringContentLength="2147483647"
-            maxArrayLength="2147483647"
-            maxBytesPerRead="2147483647"
-            maxNameTableCharCount="2147483647" />
+        <binding name="tcpBinding" transferMode="Streamed" sendTimeout="00:10:00" receiveTimeout="00:10:00" maxBufferSize="2147483647" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
           <security mode="Transport">
             <transport clientCredentialType="Windows" />
           </security>      
diff --git a/Service.EDMIService/EDMIService.vb b/Service.EDMIService/EDMIService.vb
index 8ffa7337..aa107890 100644
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -73,12 +73,12 @@ Public Class EDMIService
 #Region "=== Database ==="
     Public Function ReturnDatatableFromCache(Name As String, FilterExpression As String, SortByColumn As String) As TableResult Implements IEDMIService.ReturnDatatableFromCache
         Try
-            _Logger.Info($"ReturnDatatableFromCache, Datatable: {Name}")
+            _Logger.Info($"ReturnDatatableFromCache: Datatable: {Name}")
 
             Dim oDataset As DataSet = GlobalState.TableStore
             Dim oDataTable As DataTable = Nothing
 
-            _Logger.Debug("DataSet contains [{0}] datatables", oDataset.Tables.Count)
+            _Logger.Debug("ReturnDatatableFromCache: DataSet contains [{0}] datatables", oDataset.Tables.Count)
 
             If oDataset.Tables.Contains(Name) Then
                 oDataTable = oDataset.Tables.Item(Name).Copy()
@@ -99,13 +99,13 @@ Public Class EDMIService
                     oFilteredTable.TableName = Name
                 End If
 
-                _Logger.Debug("Datatable Stats for [{0}]:", Name)
+                _Logger.Debug("ReturnDatatableFromCache: Datatable Stats for [{0}]:", Name)
                 _Logger.Debug("Unfiltered: [{0}] rows", oDataTable.Rows.Count)
                 _Logger.Debug("Filtered: [{0}] rows", oFilteredTable.Rows.Count)
 
                 Return New TableResult(oFilteredTable)
             Else
-                _Logger.Warn($"Datatable {Name} does not exist")
+                _Logger.Warn($"ReturnDatatableFromCache: Datatable {Name} does not exist")
                 Dim oDetails As New DataTableDoesNotExistFault(Name)
                 Throw New FaultException(Of DataTableDoesNotExistFault)(oDetails)
             End If
diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj
index 17da2e73..6419ef82 100644
--- a/Service.EDMIService/EDMIService.vbproj
+++ b/Service.EDMIService/EDMIService.vbproj
@@ -73,8 +73,8 @@
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="Quartz, Version=3.2.3.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Quartz.3.2.3\lib\net461\Quartz.dll</HintPath>
+    <Reference Include="Quartz, Version=3.3.2.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.3.2\lib\net472\Quartz.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/Service.EDMIService/packages.config b/Service.EDMIService/packages.config
index 4c04c214..bab29d1b 100644
--- a/Service.EDMIService/packages.config
+++ b/Service.EDMIService/packages.config
@@ -3,7 +3,7 @@
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net472" />
   <package id="NLog" version="4.7.5" targetFramework="net472" />
-  <package id="Quartz" version="3.2.3" targetFramework="net472" />
+  <package id="Quartz" version="3.3.2" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.7.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />