Made changes for Basemap