Improve strategy of watchers