Start of updates for the new JSON.