Replaces previous mapviews logic