Updates for Charts 2.7