Adding more validations