Updates watcher to use new syntax
Addition debugging information