better polling source management