Added some convenience functions to map