enhance add_watch