Added basic map and search functionality