Changed watcher code to work with the new schema: