Added support for iterators