Added map and search