Improve validation.