AC-24_25 Added WaitHelper class