Improved options class.