Actors refactored