ChartFactory changed to OO