Update to new JSON format