Validators improvements