changed Map class