Changed to Akka Actor system