Map reads to reference

This is working so not sure about the change, even so that I get it. BTW
there are other places where this is not used and should be changed, if we
want consistency. Anyway, to facilitate this process I already did the
changes.