Refactored Charts.