More ActorCell refactoring