Actor refactor