Change to ChartVisualization for charts