VG-1583: Added option to include a basemap