Fixes
Adding support for the options.