Updated the validator