OGM-393 Separate notion of options and option values to avoid confusion about option identity; Simplifying API for users