Expand subclass functionality and document