Added overriding of default options