Improvement to validation etc