Add schema validation values and titles