Added stuff to MapHandler