Added base map view support