validator.addIf and validator.ensure instead of check