Added polling with a thread for cluster search