I did some refactoring for new Akka version