Added some map stuff