Validation options

Closes #1084