Renamed AddOption to Option