Handle Paul's new JSON format