Map class updated