Updated data model to reflect updated JSON format.