Validators improvement