Added support for options.