Refactoring chart hierarchy