Improve WaitHelper