Added superclass overrides