Improving Map class