Add iterators and rename classes