Add back groups wrapper