Adds additional validations