renamed map class