Use maybeAddIterator