Further optimized the file system watching