Added additional validations