Ref, making watcher part of API