Adjusting for new JSON contract