Major refactoring of ActorRef