Improved options overriding