Added wait helper