Reworked MapHandler to be Mapobject oriented