Added FileWatcher capability