Added chart and factory