Further changes to map functions