Make the validator better