Added status watcher too