Make watcher persistent

Subj