added support for options