Added more iterators; fixed sps inheritance