Some JSON structural changes