Improved the way options are defined