Improved validation.