Added a basic map class