Changes for updated JSON format