IteratorContract made more complete