Improve check in validations