Refactored some Actors to use BaseActor