More modifications to validations