Updated the map class