Move thread creation out of the watcher