Improved FilePatternWatcher