Validators improved