Added wait strategy