Added record watcher