Updated to the new JSON format