Add a few validations