Update to validation