Group options
Improved options definition