Should we let the validation query be set as a parameter?