Extend watcher command