Improve file system watching