Improve iterator for pack builder