Moved standard overrides to be included before the class definition