Map class is added