Add wait option.