Refactor to Chart