WIP Refactoring actor interface in as single ActorWrapper class