Improved data validation.