Adding support for map operations