Added loading and saving of option data