Moved Factory up out of impl, use Factory instead of ActorFactory