Changes here and there in the validation arch