Need to do some changes in watchmanager