Change abstraction level for map functions