Added optional Actor and ActorBase