Add support for autoisp