ChartData Refactoring - Complete