Added several additional validations