Added map data and clustering