Updated to be more tolerant of future expansions to the manifest format