Add support for options