improved Watcher listDeployments and listDataSources methods