Adapt WaitForChange tool to use security provider interface