improved watch service for hot deployments