Add groupId to the event key