File Watcher Logic Improvements