diff --git a/src/controllers/KpiPlanController.ts b/src/controllers/KpiPlanController.ts
index 9d468dc..2cb48a6 100644
--- a/src/controllers/KpiPlanController.ts
+++ b/src/controllers/KpiPlanController.ts
@@ -337,26 +337,32 @@ export class kpiPlanController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeDnaId = null;
     let nodeName = null;
     if (kpiPlan.child4Id != null) {
       node = 4;
       nodeId = kpiPlan.child4Id;
+      nodeDnaId = kpiPlan.child4DnaId;
       nodeName = kpiPlan.child4;
     } else if (kpiPlan.child3Id != null) {
       node = 3;
       nodeId = kpiPlan.child3Id;
+      nodeDnaId = kpiPlan.child3DnaId;
       nodeName = kpiPlan.child3;
     } else if (kpiPlan.child2Id != null) {
       node = 2;
       nodeId = kpiPlan.child2Id;
+      nodeDnaId = kpiPlan.child2DnaId;
       nodeName = kpiPlan.child2;
     } else if (kpiPlan.child1Id != null) {
       node = 1;
       nodeId = kpiPlan.child1Id;
+      nodeDnaId = kpiPlan.child1DnaId;
       nodeName = kpiPlan.child1;
     } else if (kpiPlan.rootId != null) {
       node = 0;
       nodeId = kpiPlan.rootId;
+      nodeDnaId = kpiPlan.rootDnaId;
       nodeName = kpiPlan.root;
     }
     let strategy = null;
@@ -406,8 +412,14 @@ export class kpiPlanController extends Controller {
       child2: kpiPlan.child2Id,
       child3: kpiPlan.child3Id,
       child4: kpiPlan.child4Id,
+      rootDna: kpiPlan.rootDnaId,
+      child1Dna: kpiPlan.child1DnaId,
+      child2Dna: kpiPlan.child2DnaId,
+      child3Dna: kpiPlan.child3DnaId,
+      child4Dna: kpiPlan.child4DnaId,
       node: node,
       nodeId: nodeId,
+      nodeDnaId: nodeDnaId,
       nodeName: nodeName,
       orgRevisionId: kpiPlan.orgRevisionId,
       strategy: strategy,
@@ -438,26 +450,32 @@ export class kpiPlanController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeDnaId = null;
     let nodeName = null;
     if (kpiPlan.child4Id != null) {
       node = 4;
       nodeId = kpiPlan.child4Id;
+      nodeDnaId = kpiPlan.child4DnaId;
       nodeName = kpiPlan.child4;
     } else if (kpiPlan.child3Id != null) {
       node = 3;
       nodeId = kpiPlan.child3Id;
+      nodeDnaId = kpiPlan.child3DnaId;
       nodeName = kpiPlan.child3;
     } else if (kpiPlan.child2Id != null) {
       node = 2;
       nodeId = kpiPlan.child2Id;
+      nodeDnaId = kpiPlan.child2DnaId;
       nodeName = kpiPlan.child2;
     } else if (kpiPlan.child1Id != null) {
       node = 1;
       nodeId = kpiPlan.child1Id;
+      nodeDnaId = kpiPlan.child1DnaId;
       nodeName = kpiPlan.child1;
     } else if (kpiPlan.rootId != null) {
       node = 0;
       nodeId = kpiPlan.rootId;
+      nodeDnaId = kpiPlan.rootDnaId;
       nodeName = kpiPlan.root;
     }
     let strategy = null;
@@ -508,8 +526,14 @@ export class kpiPlanController extends Controller {
       child2: kpiPlan.child2Id,
       child3: kpiPlan.child3Id,
       child4: kpiPlan.child4Id,
+      rootDna: kpiPlan.rootDnaId,
+      child1Dna: kpiPlan.child1DnaId,
+      child2Dna: kpiPlan.child2DnaId,
+      child3Dna: kpiPlan.child3DnaId,
+      child4Dna: kpiPlan.child4DnaId,
       node: node,
       nodeId: nodeId,
+      nodeDnaId: nodeDnaId,
       nodeName: nodeName,
       orgRevisionId: kpiPlan.orgRevisionId,
       strategy: strategy,
@@ -552,19 +576,19 @@ export class kpiPlanController extends Controller {
     if (requestBody.isAll === false) {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiPlan.rootId LIKE :nodeId AND kpiPlan.child1Id IS NULL";
+          condition = "kpiPlan.rootDnaId LIKE :nodeId AND kpiPlan.child1DnaId IS NULL";
           break;
         case 1:
-          condition = "kpiPlan.child1Id LIKE :nodeId AND kpiPlan.child2Id IS NULL";
+          condition = "kpiPlan.child1DnaId LIKE :nodeId AND kpiPlan.child2DnaId IS NULL";
           break;
         case 2:
-          condition = "kpiPlan.child2Id LIKE :nodeId AND kpiPlan.child3Id IS NULL";
+          condition = "kpiPlan.child2DnaId LIKE :nodeId AND kpiPlan.child3DnaId IS NULL";
           break;
         case 3:
-          condition = "kpiPlan.child3Id LIKE :nodeId AND kpiPlan.child4Id IS NULL";
+          condition = "kpiPlan.child3DnaId LIKE :nodeId AND kpiPlan.child4DnaId IS NULL";
           break;
         case 4:
-          condition = "kpiPlan.child4Id LIKE :nodeId";
+          condition = "kpiPlan.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -574,19 +598,19 @@ export class kpiPlanController extends Controller {
     } else {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiPlan.rootId LIKE :nodeId";
+          condition = "kpiPlan.rootDnaId LIKE :nodeId";
           break;
         case 1:
-          condition = "kpiPlan.child1Id LIKE :nodeId";
+          condition = "kpiPlan.child1DnaId LIKE :nodeId";
           break;
         case 2:
-          condition = "kpiPlan.child2Id LIKE :nodeId";
+          condition = "kpiPlan.child2DnaId LIKE :nodeId";
           break;
         case 3:
-          condition = "kpiPlan.child3Id LIKE :nodeId";
+          condition = "kpiPlan.child3DnaId LIKE :nodeId";
           break;
         case 4:
-          condition = "kpiPlan.child4Id LIKE :nodeId";
+          condition = "kpiPlan.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -776,19 +800,19 @@ export class kpiPlanController extends Controller {
     if (requestBody.isAll === false) {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiPlan.rootId LIKE :nodeId AND kpiPlan.child1Id IS NULL";
+          condition = "kpiPlan.rootDnaId LIKE :nodeId AND kpiPlan.child1DnaId IS NULL";
           break;
         case 1:
-          condition = "kpiPlan.child1Id LIKE :nodeId AND kpiPlan.child2Id IS NULL";
+          condition = "kpiPlan.child1DnaId LIKE :nodeId AND kpiPlan.child2DnaId IS NULL";
           break;
         case 2:
-          condition = "kpiPlan.child2Id LIKE :nodeId AND kpiPlan.child3Id IS NULL";
+          condition = "kpiPlan.child2DnaId LIKE :nodeId AND kpiPlan.child3DnaId IS NULL";
           break;
         case 3:
-          condition = "kpiPlan.child3Id LIKE :nodeId AND kpiPlan.child4Id IS NULL";
+          condition = "kpiPlan.child3DnaId LIKE :nodeId AND kpiPlan.child4DnaId IS NULL";
           break;
         case 4:
-          condition = "kpiPlan.child4Id LIKE :nodeId";
+          condition = "kpiPlan.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -798,19 +822,19 @@ export class kpiPlanController extends Controller {
     } else {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiPlan.rootId LIKE :nodeId";
+          condition = "kpiPlan.rootDnaId LIKE :nodeId";
           break;
         case 1:
-          condition = "kpiPlan.child1Id LIKE :nodeId";
+          condition = "kpiPlan.child1DnaId LIKE :nodeId";
           break;
         case 2:
-          condition = "kpiPlan.child2Id LIKE :nodeId";
+          condition = "kpiPlan.child2DnaId LIKE :nodeId";
           break;
         case 3:
-          condition = "kpiPlan.child3Id LIKE :nodeId";
+          condition = "kpiPlan.child3DnaId LIKE :nodeId";
           break;
         case 4:
-          condition = "kpiPlan.child4Id LIKE :nodeId";
+          condition = "kpiPlan.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
diff --git a/src/controllers/KpiRoleController.ts b/src/controllers/KpiRoleController.ts
index 01134d4..2db416f 100644
--- a/src/controllers/KpiRoleController.ts
+++ b/src/controllers/KpiRoleController.ts
@@ -310,26 +310,32 @@ export class kpiRoleController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeDnaId = null;
     let nodeName = null;
     if (kpiRole.child4Id != null) {
       node = 4;
       nodeId = kpiRole.child4Id;
+      nodeDnaId = kpiRole.child4DnaId;
       nodeName = kpiRole.child4;
     } else if (kpiRole.child3Id != null) {
       node = 3;
       nodeId = kpiRole.child3Id;
+      nodeDnaId = kpiRole.child3DnaId;
       nodeName = kpiRole.child3;
     } else if (kpiRole.child2Id != null) {
       node = 2;
       nodeId = kpiRole.child2Id;
+      nodeDnaId = kpiRole.child2DnaId;
       nodeName = kpiRole.child2;
     } else if (kpiRole.child1Id != null) {
       node = 1;
       nodeId = kpiRole.child1Id;
+      nodeDnaId = kpiRole.child1DnaId;
       nodeName = kpiRole.child1;
     } else if (kpiRole.rootId != null) {
       node = 0;
       nodeId = kpiRole.rootId;
+      nodeDnaId = kpiRole.rootDnaId;
       nodeName = kpiRole.root;
     }
     const formattedData = {
@@ -356,8 +362,14 @@ export class kpiRoleController extends Controller {
       child2: kpiRole.child2Id,
       child3: kpiRole.child3Id,
       child4: kpiRole.child4Id,
+      rootDna: kpiRole.rootDnaId,
+      child1Dna: kpiRole.child1DnaId,
+      child2Dna: kpiRole.child2DnaId,
+      child3Dna: kpiRole.child3DnaId,
+      child4Dna: kpiRole.child4DnaId,
       node: node,
       nodeId: nodeId,
+      nodeDnaId: nodeDnaId,
       nodeName: nodeName,
       orgRevisionId: kpiRole.orgRevisionId,
       position: kpiRole.position,
@@ -381,26 +393,32 @@ export class kpiRoleController extends Controller {
     }
     let node = null;
     let nodeId = null;
+    let nodeDnaId = null;
     let nodeName = null;
     if (kpiRole.child4Id != null) {
       node = 4;
       nodeId = kpiRole.child4Id;
+      nodeDnaId = kpiRole.child4DnaId;
       nodeName = kpiRole.child4;
     } else if (kpiRole.child3Id != null) {
       node = 3;
       nodeId = kpiRole.child3Id;
+      nodeDnaId = kpiRole.child3DnaId;
       nodeName = kpiRole.child3;
     } else if (kpiRole.child2Id != null) {
       node = 2;
       nodeId = kpiRole.child2Id;
+      nodeDnaId = kpiRole.child2DnaId;
       nodeName = kpiRole.child2;
     } else if (kpiRole.child1Id != null) {
       node = 1;
       nodeId = kpiRole.child1Id;
+      nodeDnaId = kpiRole.child1DnaId;
       nodeName = kpiRole.child1;
     } else if (kpiRole.rootId != null) {
       node = 0;
       nodeId = kpiRole.rootId;
+      nodeDnaId = kpiRole.rootDnaId;
       nodeName = kpiRole.root;
     }
     const formattedData = {
@@ -427,8 +445,14 @@ export class kpiRoleController extends Controller {
       child2: kpiRole.child2Id,
       child3: kpiRole.child3Id,
       child4: kpiRole.child4Id,
+      rootDna: kpiRole.rootDnaId,
+      child1Dna: kpiRole.child1DnaId,
+      child2Dna: kpiRole.child2DnaId,
+      child3Dna: kpiRole.child3DnaId,
+      child4Dna: kpiRole.child4DnaId,
       node: node,
       nodeId: nodeId,
+      nodeDnaId: nodeDnaId,
       nodeName: nodeName,
       orgRevisionId: kpiRole.orgRevisionId,
       position: kpiRole.position,
@@ -465,19 +489,19 @@ export class kpiRoleController extends Controller {
     if (requestBody.isAll === false) {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiRole.rootId LIKE :nodeId AND kpiRole.child1Id IS NULL";
+          condition = "kpiRole.rootDnaId LIKE :nodeId AND kpiRole.child1DnaId IS NULL";
           break;
         case 1:
-          condition = "kpiRole.child1Id LIKE :nodeId AND kpiRole.child2Id IS NULL";
+          condition = "kpiRole.child1DnaId LIKE :nodeId AND kpiRole.child2DnaId IS NULL";
           break;
         case 2:
-          condition = "kpiRole.child2Id LIKE :nodeId AND kpiRole.child3Id IS NULL";
+          condition = "kpiRole.child2DnaId LIKE :nodeId AND kpiRole.child3DnaId IS NULL";
           break;
         case 3:
-          condition = "kpiRole.child3Id LIKE :nodeId AND kpiRole.child4Id IS NULL";
+          condition = "kpiRole.child3DnaId LIKE :nodeId AND kpiRole.child4DnaId IS NULL";
           break;
         case 4:
-          condition = "kpiRole.child4Id LIKE :nodeId";
+          condition = "kpiRole.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -487,19 +511,19 @@ export class kpiRoleController extends Controller {
     } else {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiRole.rootId LIKE :nodeId";
+          condition = "kpiRole.rootDnaId LIKE :nodeId";
           break;
         case 1:
-          condition = "kpiRole.child1Id LIKE :nodeId";
+          condition = "kpiRole.child1DnaId LIKE :nodeId";
           break;
         case 2:
-          condition = "kpiRole.child2Id LIKE :nodeId";
+          condition = "kpiRole.child2DnaId LIKE :nodeId";
           break;
         case 3:
-          condition = "kpiRole.child3Id LIKE :nodeId";
+          condition = "kpiRole.child3DnaId LIKE :nodeId";
           break;
         case 4:
-          condition = "kpiRole.child4Id LIKE :nodeId";
+          condition = "kpiRole.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -710,19 +734,19 @@ export class kpiRoleController extends Controller {
     if (requestBody.isAll === false) {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiRole.rootId LIKE :nodeId AND kpiRole.child1Id IS NULL";
+          condition = "kpiRole.rootDnaId LIKE :nodeId AND kpiRole.child1DnaId IS NULL";
           break;
         case 1:
-          condition = "kpiRole.child1Id LIKE :nodeId AND kpiRole.child2Id IS NULL";
+          condition = "kpiRole.child1DnaId LIKE :nodeId AND kpiRole.child2DnaId IS NULL";
           break;
         case 2:
-          condition = "kpiRole.child2Id LIKE :nodeId AND kpiRole.child3Id IS NULL";
+          condition = "kpiRole.child2DnaId LIKE :nodeId AND kpiRole.child3DnaId IS NULL";
           break;
         case 3:
-          condition = "kpiRole.child3Id LIKE :nodeId AND kpiRole.child4Id IS NULL";
+          condition = "kpiRole.child3DnaId LIKE :nodeId AND kpiRole.child4DnaId IS NULL";
           break;
         case 4:
-          condition = "kpiRole.child4Id LIKE :nodeId";
+          condition = "kpiRole.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";
@@ -732,19 +756,19 @@ export class kpiRoleController extends Controller {
     } else {
       switch (requestBody.node) {
         case 0:
-          condition = "kpiRole.rootId LIKE :nodeId";
+          condition = "kpiRole.rootDnaId LIKE :nodeId";
           break;
         case 1:
-          condition = "kpiRole.child1Id LIKE :nodeId";
+          condition = "kpiRole.child1DnaId LIKE :nodeId";
           break;
         case 2:
-          condition = "kpiRole.child2Id LIKE :nodeId";
+          condition = "kpiRole.child2DnaId LIKE :nodeId";
           break;
         case 3:
-          condition = "kpiRole.child3Id LIKE :nodeId";
+          condition = "kpiRole.child3DnaId LIKE :nodeId";
           break;
         case 4:
-          condition = "kpiRole.child4Id LIKE :nodeId";
+          condition = "kpiRole.child4DnaId LIKE :nodeId";
           break;
         default:
           condition = "1=1";