AUTO-539 Added group name to state dict