Added improved group actions for #550
More changes in #550