Added graph

and updated charting data retrieval