added Map class