Added support for non-required options.