changes to the Map class