Added types to iterator and sets