Adapt to change in JSON format