adding register watchers support