Improved options definition