[enh] Add watchers + bugfix