Map class added