Updates to adapt to formal Basemap API