Added some map utilities