added additional validations