diff --git a/engine/src/main/resources/application.conf b/engine/src/main/resources/application.conf
index bab83ff..097ed2a 100644
--- a/engine/src/main/resources/application.conf
+++ b/engine/src/main/resources/application.conf
@@ -48,13 +48,13 @@ app {
   //Default Thumbnail Settings
   thumbnail {
     //Directory where to store thumbnails
-    directory = ".cache/thumbnails/"
+    directory = "./cache/thumbnails/"
     //Size of the thumbnail to generate and store
     size = 128
   }
   //Default Database Settings 
   database {
-    connectionURL = "jdbc:h2:.cache/imageTools"
+    connectionURL = "jdbc:h2:./cache/imageTools"
     inMemory = false
   }
 }
\ No newline at end of file
diff --git a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
index 097c066..3802a98 100644
--- a/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
+++ b/engine/src/main/scala/com/sothr/imagetools/engine/ConcurrentEngine.scala
@@ -3,13 +3,14 @@ package com.sothr.imagetools.engine
 import java.io.File
 import java.util.concurrent.TimeUnit
 
-import akka.actor._
+import akka.actor.{Actor, ActorLogging, ActorRef, PoisonPill, Props}
 import akka.pattern.ask
-import akka.routing.{Broadcast, RoundRobinRouter, SmallestMailboxRouter}
+import akka.routing.{Broadcast, RoundRobinPool, SmallestMailboxPool}
 import akka.util.Timeout
 import com.sothr.imagetools.engine.hash.HashService
 import com.sothr.imagetools.engine.image.{Image, ImageService, SimilarImages}
-import com.sothr.imagetools.engine.util._
+import com.sothr.imagetools.engine.util
+import com.sothr.imagetools.engine.util.{PropertiesService, PropertyEnum}
 
 import scala.collection.mutable
 import scala.concurrent.Await
@@ -134,7 +135,7 @@ class ConcurrentEngineProcessingController extends Actor with ActorLogging {
     if (processors > max) threads = max else if (processors > 1) threads = processors - 1 else threads = 1
     threads
   }
-  var router = context.actorOf(Props[ConcurrentEngineProcessingActor].withRouter(SmallestMailboxRouter(nrOfInstances = numOfRouters)))
+  var router = context.actorOf(Props[ConcurrentEngineProcessingActor].withRouter(SmallestMailboxPool(nrOfInstances = numOfRouters)))
 
   var images: mutable.MutableList[Image] = new mutable.MutableList[Image]()
   var toProcess = 0
@@ -288,7 +289,7 @@ class ConcurrentEngineSimilarityController extends Actor with ActorLogging {
     if (processors > max) threads = max else if (processors > 1) threads = processors - 1 else threads = 1
     threads
   }
-  val router = context.actorOf(Props[ConcurrentEngineSimilarityActor].withRouter(RoundRobinRouter(nrOfInstances = numOfRouters)))
+  val router = context.actorOf(Props[ConcurrentEngineSimilarityActor].withRouter(RoundRobinPool(nrOfInstances = numOfRouters)))
 
   val allSimilarImages = new mutable.MutableList[SimilarImages]
   var toProcess = 0
diff --git a/parent/pom.xml b/parent/pom.xml
index 52949c5..91f1479 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -62,27 +62,27 @@
     <imagetools.engine.version>0.1.2</imagetools.engine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jdk.version>1.8</jdk.version>
-    <scala.binary.version>2.11</scala.binary.version>
-    <lib.scala-library.version>2.11.2</lib.scala-library.version>
-    <lib.junit.version>4.11</lib.junit.version>
-    <lib.scalatest.version>2.2.1</lib.scalatest.version>
-    <lib.logback.version>1.1.2</lib.logback.version>
-    <lib.slf4j.version>1.7.7</lib.slf4j.version>
-    <lib.grizzled-slf4j.version>1.0.2</lib.grizzled-slf4j.version>
-    <lib.akka.version>2.3.5</lib.akka.version>
+    <scala.binary.version>2.12</scala.binary.version>
+    <lib.scala-library.version>2.12.4</lib.scala-library.version>
+    <lib.junit.version>4.12</lib.junit.version>
+    <lib.scalatest.version>3.0.4</lib.scalatest.version>
+    <lib.logback.version>1.2.3</lib.logback.version>
+    <lib.slf4j.version>1.7.25</lib.slf4j.version>
+    <lib.grizzled-slf4j.version>1.3.2</lib.grizzled-slf4j.version>
+    <lib.akka.version>2.5.8</lib.akka.version>
     <lib.jta.version>1.1</lib.jta.version>
-    <lib.ehcache.version>2.8.0</lib.ehcache.version>
-    <lib.commons-cli.version>1.2</lib.commons-cli.version>
-    <lib.commons-codec.version>1.9</lib.commons-codec.version>
+    <lib.ehcache.version>2.10.4</lib.ehcache.version>
+    <lib.commons-cli.version>1.4</lib.commons-cli.version>
+    <lib.commons-codec.version>1.11</lib.commons-codec.version>
     <lib.jtransforms.version>2.4.0</lib.jtransforms.version>
-    <lib.typesafe-config.version>1.2.0</lib.typesafe-config.version>
+    <lib.typesafe-config.version>1.3.2</lib.typesafe-config.version>
     <lib.thumbnailator.version>[0.4, 0.5)</lib.thumbnailator.version>
-    <lib.h2database.version>1.3.175</lib.h2database.version>
-    <lib.hibernate.version>4.3.0.Final</lib.hibernate.version>
-    <lib.hibernate.ehcache.version>2.6.6</lib.hibernate.ehcache.version>
-    <lib.markdown4j.version>2.2-cj-1.0</lib.markdown4j.version>
-    <lib.scala-arm.version>1.4</lib.scala-arm.version>
-    <lib.twelvemonkeys.imageio.version>3.0</lib.twelvemonkeys.imageio.version>
+    <lib.h2database.version>1.4.196</lib.h2database.version>
+    <lib.hibernate.version>4.3.11.Final</lib.hibernate.version><!-- Upgrade to 5.2.12.Final -->
+    <lib.hibernate.ehcache.version>2.6.11</lib.hibernate.ehcache.version>
+    <lib.markdown4j.version>2.2-cj-1.1</lib.markdown4j.version>
+    <lib.scala-arm.version>2.0</lib.scala-arm.version>
+    <lib.twelvemonkeys.imageio.version>3.3.2</lib.twelvemonkeys.imageio.version>
   </properties>
 
   <dependencyManagement>
@@ -171,7 +171,7 @@
       </dependency>
       <dependency>
         <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-actor_2.11</artifactId>
+        <artifactId>akka-actor_${scala.binary.version}</artifactId>
         <version>${lib.akka.version}</version>
       </dependency>
       <dependency>