Added a lot of map functionality