custom value options added to schema. Other uncommited changes.