Watcher management is now working fully