Add Validator

Ensure that only the choices defined are valid.