Added wait helpers.