More changes to the validation impl