Refactor subclasses