Added charting lib and support 13