Improving the validator.