Add group and stage to opportunities