Keep using watcher header for now