revise map class syntax