Updated code to reflect changes to DataReader

Replaced maps with tuples