Validator: support 'choices' option