Adding further validations