Make Watcher work for directories too