more work on supporting more base maps