Switch from dictionary to 2-tuple for chart data