enhanced FileWatcherService