Added watcher for tools