Remove public watcher constructor and construct it internally