Tidy up imports and add required methods for superclass.