reintroduce support for options