Change validation data structure

and add file level inversion