Refactored actors