Added a map class