Initial update for new file format