Updated ChartController