Refactor, added unbounded iterators