Preserve groupId in plugins and add groupId for new plugins