Improvements to group iterator