Added map class