Some changes to the way the jsons are parsed.