Changes to validation