ENH: Updated file formats to V2