Add support for IDO-mode