Almost finished support for 'map'