Global chart refactoring