Improved/added iterators and same for the api they use.