Add support for map