More changes to validation