Add wait exchange options