Improvements on map