Added required overrides