Updated functions of the map class