Include groupId in the id