Initial file watcher support