Working more on map implementation