added more charting support