Added wait component