Update to validations