Some changes for the map