Added charting class