Refactored classes to use ``super`` where applicable.