Added line and pie chart support