Added support for overriding default options.