GenericIterator modified