Added a Map class