Added additional functions for map.