Update to new json style