Refactored charts