Add some map functionality