Improving the map structure