Major overhaul to make it work with Akka 2.2