Added file system watcher