Added map clustering