Add more info and watcher diagram