Refactored options class.