added support for the options