Added update and add work-space functions outside of adding-watcher function.