Add more validation.