Added support for options