improved data sources and deployments watch service