Refactor Iterators

Updated iterator logic and configs across all services