Re-add new dataset iterators