Updated map class