Moved options into the options data access interface