added full basemap support