Updated to use the new JSON format