Some additional validations are added