Make the map more useful