Updated Basemap part