Added support for stacked options.