Use new file watcher