Updated file format and headers