Construct the tuple straight away instead of using dicts
Document the file format