Added Chart generation