Fixed groupId mappings