Updated charting to work with 4.4

Remove dependencies on MeasureData