Changed JSON structure