Further improvements to Collective extension