Charts refactor