Fix broken models build due to json upgrade