improved Validations