Add no_destination option