Updated JSON structure