Add support for #options