CMS-4346 Store Group as Node