Improving the map structure...