Changed data file format/reading