Changes to validations