Add iterators and update doc