Added chart and new features