Finished the group collection extension