Moving to Akka based system