Add ability to use a group identifier