Add wait_for_not_exists