Chart refactor