Added charting capability