Improvement to validation