Added MapView logic