Added features overrides