Refactored data descriptors and chart rendering