More work on the directory watcher service