Add UpdateWaiter and UpdateHelper