diff --git a/src/__tests__/filters-formatNodeProp.spec.ts b/src/__tests__/filters-formatNodeProp.spec.ts
deleted file mode 100644
index 9618ff13..00000000
--- a/src/__tests__/filters-formatNodeProp.spec.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { describe, it, expect } from "vitest"
-import { formatNodeProp } from "@/filters"
-import { NodeProp } from "@/enums"
-
-
-describe("formatNodeProp", () => {
-  describe("duration", () => {
-    it("formats duration", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_TOTAL_TIME, 1234.56)).toBe("1s 235ms");
-    })
-    it("returns N/A for undefined", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_TOTAL_TIME, undefined)).toBe("-");
-    })
-  })
-
-  describe("cost", () => {
-    it("formats cost", () => {
-      expect(formatNodeProp(NodeProp.TOTAL_COST, 1234.56)).toBe("1,234.56");
-    })
-    it("formats cost with fraction digits", () => {
-      expect(formatNodeProp(NodeProp.TOTAL_COST, 1234)).toBe("1,234.00");
-    })
-    it("returns N/A for undefined", () => {
-      expect(formatNodeProp(NodeProp.TOTAL_COST, undefined)).toBe("N/A");
-    })
-  })
-
-  describe("rows", () => {
-    it("formats rows", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_ROWS, 1000)).toBe("1,000");
-    })
-    it("returns N/A for undefined", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_ROWS, undefined)).toBe("N/A");
-    })
-  })
-
-  describe("loops", () => {
-    it("formats loops", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_LOOPS, 1000)).toBe("1,000");
-    })
-    it("returns N/A for undefined", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_LOOPS, undefined)).toBe("N/A");
-    })
-  })
-
-  describe("factor", () => {
-    it("formats a factor with a times symbol", () => {
-      expect(formatNodeProp(NodeProp.PLANNER_ESTIMATE_FACTOR, 3.456)).toBe("3.5 ×");
-    });
-
-    it("rounds to 2 significant figures", () => {
-      expect(formatNodeProp(NodeProp.PLANNER_ESTIMATE_FACTOR, 1234)).toBe("1,200 ×");
-    });
-
-    it("returns N/A for undefined", () => {
-      expect(formatNodeProp(NodeProp.PLANNER_ESTIMATE_FACTOR, undefined)).toBe("N/A");
-    });
-  });
-
-  describe("kilobytes", () => {
-    it("formats kilobytes", () => {
-      expect(formatNodeProp(NodeProp.SORT_SPACE_USED, 1151688)).toBe("1.1 GB");
-    });
-  });
-
-  describe("bytes", () => {
-    it("formats bytes", () => {
-      expect(formatNodeProp(NodeProp.WAL_BYTES, 1151688)).toBe("1.1 MB");
-    });
-  });
-
-  describe("boolean", () => {
-    it("returns 'yes' for true", () => {
-      expect(formatNodeProp(NodeProp.ACTUAL_ROWS_FRACTIONAL, true)).toBe("yes");
-    });
-  });
-
-  it("returns 'no' for false", () => {
-    expect(formatNodeProp(NodeProp.ACTUAL_ROWS_FRACTIONAL, false)).toBe("no");
-  });
-
-  describe("blockAsBytes", () => {
-    it("formats blocks", () => {
-        expect(formatNodeProp(NodeProp.SHARED_HIT_BLOCKS, 1234)).toBe("1,234<br><small>9.6 MB</small>");
-      });
-    });
-
-  describe("no formatter provided", () => {
-    it("escapes ", () => {
-        expect(formatNodeProp(NodeProp.FILTER, "something")).toBe("something");
-      });
-    });
-});
diff --git a/src/__tests__/filters-formatProp.spec.ts b/src/__tests__/filters-formatProp.spec.ts
new file mode 100644
index 00000000..23869658
--- /dev/null
+++ b/src/__tests__/filters-formatProp.spec.ts
@@ -0,0 +1,93 @@
+import { describe, it, expect } from "vitest"
+import { formatProp } from "@/filters"
+import { Property } from "@/enums"
+
+
+describe("formatProp", () => {
+  describe("duration", () => {
+    it("formats duration", () => {
+      expect(formatProp(Property.ACTUAL_TOTAL_TIME, 1234.56)).toBe("1s 235ms");
+    })
+    it("returns N/A for undefined", () => {
+      expect(formatProp(Property.ACTUAL_TOTAL_TIME, undefined)).toBe("-");
+    })
+  })
+
+  describe("cost", () => {
+    it("formats cost", () => {
+      expect(formatProp(Property.TOTAL_COST, 1234.56)).toBe("1,234.56");
+    })
+    it("formats cost with fraction digits", () => {
+      expect(formatProp(Property.TOTAL_COST, 1234)).toBe("1,234.00");
+    })
+    it("returns N/A for undefined", () => {
+      expect(formatProp(Property.TOTAL_COST, undefined)).toBe("N/A");
+    })
+  })
+
+  describe("rows", () => {
+    it("formats rows", () => {
+      expect(formatProp(Property.ACTUAL_ROWS, 1000)).toBe("1,000");
+    })
+    it("returns N/A for undefined", () => {
+      expect(formatProp(Property.ACTUAL_ROWS, undefined)).toBe("N/A");
+    })
+  })
+
+  describe("loops", () => {
+    it("formats loops", () => {
+      expect(formatProp(Property.ACTUAL_LOOPS, 1000)).toBe("1,000");
+    })
+    it("returns N/A for undefined", () => {
+      expect(formatProp(Property.ACTUAL_LOOPS, undefined)).toBe("N/A");
+    })
+  })
+
+  describe("factor", () => {
+    it("formats a factor with a times symbol", () => {
+      expect(formatProp(Property.PLANNER_ESTIMATE_FACTOR, 3.456)).toBe("3.5&nbsp;&times;");
+    });
+
+    it("rounds to 2 significant figures", () => {
+      expect(formatProp(Property.PLANNER_ESTIMATE_FACTOR, 1234)).toBe("1,200&nbsp;&times;");
+    });
+
+    it("returns N/A for undefined", () => {
+      expect(formatProp(Property.PLANNER_ESTIMATE_FACTOR, undefined)).toBe("N/A");
+    });
+  });
+
+  describe("kilobytes", () => {
+    it("formats kilobytes", () => {
+      expect(formatProp(Property.SORT_SPACE_USED, 1151688)).toBe("1.1 GB");
+    });
+  });
+
+  describe("bytes", () => {
+    it("formats bytes", () => {
+      expect(formatProp(Property.WAL_BYTES, 1151688)).toBe("1.1 MB");
+    });
+  });
+
+  describe("boolean", () => {
+    it("returns 'yes' for true", () => {
+      expect(formatProp(Property.ACTUAL_ROWS_FRACTIONAL, true)).toBe("yes");
+    });
+  });
+
+  it("returns 'no' for false", () => {
+    expect(formatProp(Property.ACTUAL_ROWS_FRACTIONAL, false)).toBe("no");
+  });
+
+  describe("blockAsBytes", () => {
+    it("formats blocks", () => {
+        expect(formatProp(Property.SHARED_HIT_BLOCKS, 1234)).toBe("1,234<br><small>9.6 MB</small>");
+      });
+    });
+
+  describe("no formatter provided", () => {
+    it("escapes ", () => {
+        expect(formatProp(Property.FILTER, "something")).toBe("something");
+      });
+    });
+});
diff --git a/src/__tests__/filters-output-escape.spec.ts b/src/__tests__/filters-output-escape.spec.ts
index 45db3383..17d38ebc 100644
--- a/src/__tests__/filters-output-escape.spec.ts
+++ b/src/__tests__/filters-output-escape.spec.ts
@@ -1,10 +1,10 @@
 import { describe, expect, test } from "vitest"
-import { formatNodeProp } from "@/filters"
-import { NodeProp } from "@/enums"
+import { formatProp } from "@/filters"
+import { Property } from "@/enums"
 
 describe("formatNodeProp", () => {
   test("escapes HTML in Output list items", () => {
-    const html = formatNodeProp(NodeProp.OUTPUT, [
+    const html = formatProp(Property.OUTPUT, [
       "<img src=x onerror=alert(1)>",
     ])
     expect(html).toContain("&lt;img src=x onerror=alert(1)&gt;")
diff --git a/src/components/BuffersDetail.vue b/src/components/BuffersDetail.vue
index 14ca6130..0be6ea92 100644
--- a/src/components/BuffersDetail.vue
+++ b/src/components/BuffersDetail.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { formatBlocks } from "@/filters"
 import type { ISerialization, Node } from "@/interfaces"
-import { BuffersProp, NodeProp } from "@/enums"
+import { Property } from "@/enums"
 
 interface Props {
   object: Node | ISerialization
@@ -9,45 +9,45 @@ interface Props {
 const props = defineProps<Props>()
 
 const sharedHitBlocks =
-  NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]
-    : props.object[BuffersProp.SHARED_HIT_BLOCKS]
+  Property.EXCLUSIVE_SHARED_HIT_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_SHARED_HIT_BLOCKS]
+    : props.object[Property.SHARED_HIT_BLOCKS]
 const sharedReadBlocks =
-  NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]
-    : props.object[BuffersProp.SHARED_READ_BLOCKS]
+  Property.EXCLUSIVE_SHARED_READ_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_SHARED_READ_BLOCKS]
+    : props.object[Property.SHARED_READ_BLOCKS]
 const sharedDirtiedBlocks =
-  NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
-    : props.object[BuffersProp.SHARED_DIRTIED_BLOCKS]
+  Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
+    : props.object[Property.SHARED_DIRTIED_BLOCKS]
 const sharedWrittenBlocks =
-  NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
-    : props.object[BuffersProp.SHARED_WRITTEN_BLOCKS]
+  Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
+    : props.object[Property.SHARED_WRITTEN_BLOCKS]
 const localHitBlocks =
-  NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]
-    : props.object[BuffersProp.LOCAL_HIT_BLOCKS]
+  Property.EXCLUSIVE_LOCAL_HIT_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]
+    : props.object[Property.LOCAL_HIT_BLOCKS]
 const localReadBlocks =
-  NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]
-    : props.object[BuffersProp.LOCAL_READ_BLOCKS]
+  Property.EXCLUSIVE_LOCAL_READ_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_LOCAL_READ_BLOCKS]
+    : props.object[Property.LOCAL_READ_BLOCKS]
 const localDirtiedBlocks =
-  NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
-    : props.object[BuffersProp.LOCAL_DIRTIED_BLOCKS]
+  Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
+    : props.object[Property.LOCAL_DIRTIED_BLOCKS]
 const localWrittenBlocks =
-  NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
-    : props.object[BuffersProp.LOCAL_WRITTEN_BLOCKS]
+  Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
+    : props.object[Property.LOCAL_WRITTEN_BLOCKS]
 const tempReadBlocks =
-  NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]
-    : props.object[BuffersProp.TEMP_READ_BLOCKS]
+  Property.EXCLUSIVE_TEMP_READ_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_TEMP_READ_BLOCKS]
+    : props.object[Property.TEMP_READ_BLOCKS]
 const tempWrittenBlocks =
-  NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS in props.object
-    ? props.object[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
-    : props.object[BuffersProp.TEMP_WRITTEN_BLOCKS]
+  Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS in props.object
+    ? props.object[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
+    : props.object[Property.TEMP_WRITTEN_BLOCKS]
 </script>
 <template>
   <table class="table table-sm">
diff --git a/src/components/Diagram.vue b/src/components/Diagram.vue
index 3f507772..133f2ad7 100644
--- a/src/components/Diagram.vue
+++ b/src/components/Diagram.vue
@@ -9,7 +9,7 @@ import {
   ref,
   watch,
 } from "vue"
-import { BufferLocation, NodeProp, Metric } from "../enums"
+import { BufferLocation, Property, Metric } from "../enums"
 import {
   getHelpMessage,
   scrollChildIntoParentView,
@@ -63,7 +63,7 @@ const dataAvailable = computed((): boolean => {
 })
 
 function isCTE(node: Node): boolean {
-  return _.startsWith(node[NodeProp.SUBPLAN_NAME], "CTE")
+  return _.startsWith(node[Property.SUBPLAN_NAME], "CTE")
 }
 
 function scrollTo(el: Element) {
@@ -219,7 +219,7 @@ provide("scrollTo", scrollTo)
             <th colspan="3" class="subplan">Main Query Plan</th>
           </tr>
           <template v-for="row in flat" :key="row">
-            <tr v-if="row.node[NodeProp.SUBPLAN_NAME]">
+            <tr v-if="row.node[Property.SUBPLAN_NAME]">
               <td></td>
               <td
                 :class="{ 'fw-bold': isCTE(row.node) }"
@@ -231,7 +231,7 @@ provide("scrollTo", scrollTo)
                   href=""
                   @click.prevent="selectNode(row.node.nodeId, true)"
                 >
-                  {{ row.node[NodeProp.SUBPLAN_NAME] }}
+                  {{ row.node[Property.SUBPLAN_NAME] }}
                 </a>
               </td>
             </tr>
diff --git a/src/components/DiagramRow.vue b/src/components/DiagramRow.vue
index 909a846d..3b56eb82 100644
--- a/src/components/DiagramRow.vue
+++ b/src/components/DiagramRow.vue
@@ -9,7 +9,7 @@ import {
   ViewOptionsKey,
 } from "@/symbols"
 import type { ViewOptions } from "@/interfaces"
-import { EstimateDirection, BufferLocation, NodeProp, Metric } from "../enums"
+import { EstimateDirection, BufferLocation, Property, Metric } from "../enums"
 import LevelDivider from "@/components/LevelDivider.vue"
 import TimeTooltip from "@/components/tooltip/TimeTooltip.vue"
 import IoTooltip from "@/components/tooltip/IoTooltip.vue"
@@ -81,9 +81,9 @@ const isHighlighted = computed(
     @click.prevent="selectNode(node.nodeId, true)"
   >
     <template #content>
-      <template v-if="node[NodeProp.CTE_NAME]">
+      <template v-if="node[Property.CTE_NAME]">
         <div>
-          <em>CTE {{ node[NodeProp.CTE_NAME] }} </em>
+          <em>CTE {{ node[Property.CTE_NAME] }} </em>
         </div>
       </template>
       <TimeTooltip
@@ -117,7 +117,7 @@ const isHighlighted = computed(
     <td>
       <LevelDivider
         :row="row"
-        :isSubplan="!!node[NodeProp.SUBPLAN_NAME]"
+        :isSubplan="!!node[Property.SUBPLAN_NAME]"
         dense
       ></LevelDivider>
       <span
@@ -142,15 +142,15 @@ const isHighlighted = computed(
         <div
           class="progress-bar border-secondary bg-secondary"
           :class="{
-            'border-start': node[NodeProp.EXCLUSIVE_DURATION] > 0,
+            'border-start': node[Property.EXCLUSIVE_DURATION] > 0,
           }"
           role="progressbar"
           style="height: 5px"
           :style="{
             width:
-              (node[NodeProp.EXCLUSIVE_DURATION] /
+              (node[Property.EXCLUSIVE_DURATION] /
                 (store.stats.executionTime ||
-                  store.plan?.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] ||
+                  store.plan?.content.Plan[Property.ACTUAL_TOTAL_TIME] ||
                   0)) *
                 100 +
               '%',
@@ -165,10 +165,10 @@ const isHighlighted = computed(
           style="height: 5px"
           :style="{
             width:
-              (((node[NodeProp.ACTUAL_TOTAL_TIME] || 0) -
-                node[NodeProp.EXCLUSIVE_DURATION]) /
+              (((node[Property.ACTUAL_TOTAL_TIME] || 0) -
+                node[Property.EXCLUSIVE_DURATION]) /
                 (store.stats.executionTime ||
-                  store.plan?.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] ||
+                  store.plan?.content.Plan[Property.ACTUAL_TOTAL_TIME] ||
                   0)) *
                 100 +
               '%',
@@ -191,7 +191,7 @@ const isHighlighted = computed(
           :style="{
             width:
               Math.round(
-                (node[NodeProp.ACTUAL_ROWS_REVISED] / store.stats.maxRows) *
+                (node[Property.ACTUAL_ROWS_REVISED] / store.stats.maxRows) *
                   100,
               ) + '%',
           }"
@@ -211,7 +211,7 @@ const isHighlighted = computed(
             fixed-width
             :icon="faArrowDown"
             v-if="
-              node[NodeProp.PLANNER_ESTIMATE_DIRECTION] ===
+              node[Property.PLANNER_ESTIMATE_DIRECTION] ===
               EstimateDirection.under
             "
           ></FontAwesomeIcon>
@@ -220,7 +220,7 @@ const isHighlighted = computed(
         <div
           class="progress-bar"
           :class="[
-            node[NodeProp.PLANNER_ESTIMATE_DIRECTION] ===
+            node[Property.PLANNER_ESTIMATE_DIRECTION] ===
             EstimateDirection.under
               ? 'bg-secondary'
               : 'bg-transparent',
@@ -243,7 +243,7 @@ const isHighlighted = computed(
         <div
           class="progress-bar"
           :class="[
-            node[NodeProp.PLANNER_ESTIMATE_DIRECTION] === EstimateDirection.over
+            node[Property.PLANNER_ESTIMATE_DIRECTION] === EstimateDirection.over
               ? 'bg-secondary'
               : 'bg-transparent',
           ]"
@@ -259,7 +259,7 @@ const isHighlighted = computed(
             fixed-width
             :icon="faArrowUp"
             v-if="
-              node[NodeProp.PLANNER_ESTIMATE_DIRECTION] ===
+              node[Property.PLANNER_ESTIMATE_DIRECTION] ===
               EstimateDirection.over
             "
           ></FontAwesomeIcon>
@@ -275,14 +275,14 @@ const isHighlighted = computed(
         <div
           class="bg-secondary"
           :class="{
-            'border-secondary border-start': node[NodeProp.EXCLUSIVE_COST] > 0,
+            'border-secondary border-start': node[Property.EXCLUSIVE_COST] > 0,
           }"
           role="progressbar"
           style="height: 5px"
           :style="{
             width:
               Math.round(
-                (node[NodeProp.EXCLUSIVE_COST] / store.stats.maxCost) * 100,
+                (node[Property.EXCLUSIVE_COST] / store.stats.maxCost) * 100,
               ) + '%',
           }"
           aria-valuenow="15"
@@ -304,14 +304,14 @@ const isHighlighted = computed(
           class="bg-hit"
           :class="{
             'border-start border-hit':
-              node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS] > 0,
+              node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS] > 0,
           }"
           role="progressbar"
           style="height: 5px"
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS] /
+                (node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.shared]) *
                   100,
               ) || 0) + '%',
@@ -325,13 +325,13 @@ const isHighlighted = computed(
           role="progressbar"
           :class="{
             'border-start border-read':
-              node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS] > 0,
+              node[Property.EXCLUSIVE_SHARED_READ_BLOCKS] > 0,
           }"
           style="height: 5px"
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS] /
+                (node[Property.EXCLUSIVE_SHARED_READ_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.shared]) *
                   100,
               ) || 0) + '%',
@@ -344,14 +344,14 @@ const isHighlighted = computed(
           class="bg-dirtied"
           :class="{
             'border-start border-dirtied':
-              node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] > 0,
+              node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] > 0,
           }"
           role="progressbar"
           style="height: 5px"
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] /
+                (node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.shared]) *
                   100,
               ) || 0) + '%',
@@ -364,14 +364,14 @@ const isHighlighted = computed(
           class="bg-written"
           :class="{
             'border-start border-written':
-              node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] > 0,
+              node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] > 0,
           }"
           role="progressbar"
           style="height: 5px"
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] /
+                (node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.shared]) *
                   100,
               ) || 0) + '%',
@@ -398,7 +398,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS] /
+                (node[Property.EXCLUSIVE_TEMP_READ_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.temp]) *
                   100,
               ) || 0) + '%',
@@ -413,7 +413,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] /
+                (node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.temp]) *
                   100,
               ) || 0) + '%',
@@ -441,7 +441,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS] /
+                (node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.local]) *
                   100,
               ) || 0) + '%',
@@ -456,7 +456,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS] /
+                (node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.local]) *
                   100,
               ) || 0) + '%',
@@ -473,7 +473,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] /
+                (node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.local]) *
                   100,
               ) || 0) + '%',
@@ -489,7 +489,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] /
+                (node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] /
                   store.stats.maxBlocks?.[BufferLocation.local]) *
                   100,
               ) || 0) + '%',
@@ -505,8 +505,8 @@ const isHighlighted = computed(
         style="height: 5px"
         v-else-if="
           diagramViewOptions.metric == Metric.io &&
-          (store.plan?.content.Plan[NodeProp.SUM_IO_READ_TIME] ||
-            store.plan?.content.Plan[NodeProp.SUM_IO_WRITE_TIME])
+          (store.plan?.content.Plan[Property.SUM_IO_READ_TIME] ||
+            store.plan?.content.Plan[Property.SUM_IO_WRITE_TIME])
         "
       >
         <div
@@ -516,7 +516,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME] /
+                (node[Property.EXCLUSIVE_SUM_IO_READ_TIME] /
                   store.stats.maxIo) *
                   100,
               ) || 0) + '%',
@@ -532,7 +532,7 @@ const isHighlighted = computed(
           :style="{
             width:
               (Math.round(
-                (node[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME] /
+                (node[Property.EXCLUSIVE_SUM_IO_WRITE_TIME] /
                   store.stats.maxIo) *
                   100,
               ) || 0) + '%',
diff --git a/src/components/DisabledBadge.vue b/src/components/DisabledBadge.vue
index 198de70c..3cf9645c 100644
--- a/src/components/DisabledBadge.vue
+++ b/src/components/DisabledBadge.vue
@@ -3,7 +3,7 @@ import { inject } from "vue"
 import { Tippy } from "vue-tippy"
 import type { Node, ViewOptions } from "@/interfaces"
 import { ViewOptionsKey } from "@/symbols"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 import useNode from "@/node"
 import { store } from "@/store"
 
@@ -13,7 +13,7 @@ import { faCircleXmark } from "@fortawesome/free-regular-svg-icons"
 const viewOptions = inject(ViewOptionsKey) as ViewOptions
 
 interface Props {
-  node: Node,
+  node: Node
 }
 const props = defineProps<Props>()
 
@@ -24,22 +24,25 @@ const appendTo = () => document.body
 
 <template>
   <Tippy interactive allowHTML :appendTo="appendTo">
-    <span
-      v-if="node[NodeProp.DISABLED]"
-      class="text-danger"
-    >
-    <FontAwesomeIcon fixed-width :icon="faCircleXmark"
-    ></FontAwesomeIcon>
+    <span v-if="node[Property.DISABLED]" class="text-danger">
+      <FontAwesomeIcon fixed-width :icon="faCircleXmark"></FontAwesomeIcon>
     </span>
     <template #content>
       <p>
-        <i>{{nodeName}}</i> has been <b>disabled</b> via a <a href='https://www.postgresql.org/docs/current/runtime-config-query.html' target='_blank'>planner method configuration parameter</a> but has been used anyway.
+        <i>{{ nodeName }}</i> has been <b>disabled</b> via a
+        <a
+          href="https://www.postgresql.org/docs/current/runtime-config-query.html"
+          target="_blank"
+          >planner method configuration parameter</a
+        >
+        but has been used anyway.
       </p>
       <p v-if="store.plan?.content.Settings">
         See corresponding 'enable' parameter in <i>Settings</i>.
       </p>
       <p v-else>
-        Tip: use the <i>SETTINGS</i> option in your EXPLAIN command to get more details.
+        Tip: use the <i>SETTINGS</i> option in your EXPLAIN command to get more
+        details.
       </p>
     </template>
   </Tippy>
diff --git a/src/components/Grid.vue b/src/components/Grid.vue
index be61f2ed..7d37b216 100644
--- a/src/components/Grid.vue
+++ b/src/components/Grid.vue
@@ -3,7 +3,7 @@ import _ from "lodash"
 import { computed, onMounted } from "vue"
 import type { Node } from "@/interfaces"
 import GridRow from "@/components/GridRow.vue"
-import { NodeProp } from "../enums"
+import { Property } from "../enums"
 import LevelDivider from "@/components/LevelDivider.vue"
 import { store } from "@/store"
 import type { FlattenedPlanNode } from "@/store"
@@ -13,13 +13,13 @@ onMounted((): void => {
 })
 
 function isCTE(node: Node): boolean {
-  return _.startsWith(node[NodeProp.SUBPLAN_NAME], "CTE")
+  return _.startsWith(node[Property.SUBPLAN_NAME], "CTE")
 }
 
 const hasTime = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_DURATION] || 0 > 1
+      return row.node[Property.EXCLUSIVE_DURATION] || 0 > 1
     })
   })
 })
@@ -28,10 +28,10 @@ const hasIORead = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
       return (
-        row.node[NodeProp.IO_READ_TIME] ||
-        row.node[NodeProp.SHARED_IO_READ_TIME] ||
-        row.node[NodeProp.LOCAL_IO_READ_TIME] ||
-        row.node[NodeProp.TEMP_IO_READ_TIME]
+        row.node[Property.IO_READ_TIME] ||
+        row.node[Property.SHARED_IO_READ_TIME] ||
+        row.node[Property.LOCAL_IO_READ_TIME] ||
+        row.node[Property.TEMP_IO_READ_TIME]
       )
     })
   })
@@ -41,10 +41,10 @@ const hasIOWrite = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
       return (
-        row.node[NodeProp.IO_WRITE_TIME] ||
-        row.node[NodeProp.SHARED_IO_WRITE_TIME] ||
-        row.node[NodeProp.LOCAL_IO_WRITE_TIME] ||
-        row.node[NodeProp.TEMP_IO_WRITE_TIME]
+        row.node[Property.IO_WRITE_TIME] ||
+        row.node[Property.SHARED_IO_WRITE_TIME] ||
+        row.node[Property.LOCAL_IO_WRITE_TIME] ||
+        row.node[Property.TEMP_IO_WRITE_TIME]
       )
     })
   })
@@ -61,7 +61,7 @@ const ioColumns = computed((): number => {
 const hasRows = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.ACTUAL_ROWS_REVISED] || 0 > 1
+      return row.node[Property.ACTUAL_ROWS_REVISED] || 0 > 1
     })
   })
 })
@@ -69,7 +69,7 @@ const hasRows = computed((): boolean => {
 const hasEstimation = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.PLANNER_ESTIMATE_FACTOR] || 0 > 1
+      return row.node[Property.PLANNER_ESTIMATE_FACTOR] || 0 > 1
     })
   })
 })
@@ -77,7 +77,7 @@ const hasEstimation = computed((): boolean => {
 const hasLoops = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.ACTUAL_LOOPS] > 1
+      return row.node[Property.ACTUAL_LOOPS] > 1
     })
   })
 })
@@ -85,7 +85,7 @@ const hasLoops = computed((): boolean => {
 const hasCost = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_COST] > 1
+      return row.node[Property.EXCLUSIVE_COST] > 1
     })
   })
 })
@@ -94,9 +94,9 @@ const hasFilter = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
       return (
-        row.node[NodeProp.ROWS_REMOVED_BY_FILTER] ||
-        row.node[NodeProp.ROWS_REMOVED_BY_JOIN_FILTER] ||
-        row.node[NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK]
+        row.node[Property.ROWS_REMOVED_BY_FILTER] ||
+        row.node[Property.ROWS_REMOVED_BY_JOIN_FILTER] ||
+        row.node[Property.ROWS_REMOVED_BY_INDEX_RECHECK]
       )
     })
   })
@@ -105,7 +105,7 @@ const hasFilter = computed((): boolean => {
 const hasHeapFetches = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.HEAP_FETCHES]
+      return row.node[Property.HEAP_FETCHES]
     })
   })
 })
@@ -125,7 +125,7 @@ const sharedBlocksColumns = computed((): number => {
 const hasSharedHit = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]
+      return row.node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS]
     })
   })
 })
@@ -133,7 +133,7 @@ const hasSharedHit = computed((): boolean => {
 const hasSharedRead = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]
+      return row.node[Property.EXCLUSIVE_SHARED_READ_BLOCKS]
     })
   })
 })
@@ -141,7 +141,7 @@ const hasSharedRead = computed((): boolean => {
 const hasSharedDirtied = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
+      return row.node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
     })
   })
 })
@@ -149,7 +149,7 @@ const hasSharedDirtied = computed((): boolean => {
 const hasSharedWritten = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
+      return row.node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
     })
   })
 })
@@ -161,7 +161,7 @@ const tempBlocksColumns = computed((): number => {
 const hasTempRead = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]
+      return row.node[Property.EXCLUSIVE_TEMP_READ_BLOCKS]
     })
   })
 })
@@ -169,7 +169,7 @@ const hasTempRead = computed((): boolean => {
 const hasTempWritten = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
+      return row.node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
     })
   })
 })
@@ -189,7 +189,7 @@ const localBlocksColumns = computed((): number => {
 const hasLocalHit = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]
+      return row.node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]
     })
   })
 })
@@ -197,7 +197,7 @@ const hasLocalHit = computed((): boolean => {
 const hasLocalRead = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]
+      return row.node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS]
     })
   })
 })
@@ -205,7 +205,7 @@ const hasLocalRead = computed((): boolean => {
 const hasLocalDirtied = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
+      return row.node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
     })
   })
 })
@@ -213,7 +213,7 @@ const hasLocalDirtied = computed((): boolean => {
 const hasLocalWritten = computed((): boolean => {
   return _.some(store.flat, (plan: FlattenedPlanNode[]) => {
     return _.some(plan, (row: FlattenedPlanNode) => {
-      return row.node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
+      return row.node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
     })
   })
 })
@@ -348,7 +348,7 @@ const columns = computed(() => {
       </thead>
       <tbody v-for="(flat, index) in store.flat" :key="index">
         <template v-for="row in flat" :key="row">
-          <tr v-if="row.node[NodeProp.SUBPLAN_NAME]">
+          <tr v-if="row.node[Property.SUBPLAN_NAME]">
             <td class="bg-body-tertiary" :colspan="1 + columnsLeft.length"></td>
             <td
               class="plan pr-2 bg-body-tertiary"
@@ -357,7 +357,7 @@ const columns = computed(() => {
             >
               <LevelDivider :row="row"></LevelDivider>
               <b class="fst-italic text-reset">
-                {{ row.node[NodeProp.SUBPLAN_NAME] }}
+                {{ row.node[Property.SUBPLAN_NAME] }}
               </b>
             </td>
           </tr>
diff --git a/src/components/GridRow.vue b/src/components/GridRow.vue
index 2a9fd004..109ad2a9 100644
--- a/src/components/GridRow.vue
+++ b/src/components/GridRow.vue
@@ -2,7 +2,7 @@
 import { computed, inject, ref } from "vue"
 import DisabledBadge from "@/components/DisabledBadge.vue"
 import type { ViewOptions } from "@/interfaces"
-import { EstimateDirection, NodeProp } from "@/enums"
+import { EstimateDirection, Property } from "@/enums"
 import { HighlightedNodeIdKey, ViewOptionsKey } from "@/symbols"
 import {
   formatBlocks,
@@ -106,17 +106,17 @@ const isHighlighted = computed(
       </template>
       <GridProgressBar
         :percentage="
-          (node[NodeProp.EXCLUSIVE_DURATION] /
+          (node[Property.EXCLUSIVE_DURATION] /
             (store.stats.executionTime ||
-              store.plan?.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] ||
+              store.plan?.content.Plan[Property.ACTUAL_TOTAL_TIME] ||
               0)) *
           100
         "
         :percentage2="
-          (((node[NodeProp.ACTUAL_TOTAL_TIME] || 0) -
-            node[NodeProp.EXCLUSIVE_DURATION]) /
+          (((node[Property.ACTUAL_TOTAL_TIME] || 0) -
+            node[Property.EXCLUSIVE_DURATION]) /
             (store.stats.executionTime ||
-              store.plan?.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] ||
+              store.plan?.content.Plan[Property.ACTUAL_TOTAL_TIME] ||
               0)) *
           100
         "
@@ -129,14 +129,14 @@ const isHighlighted = computed(
         ></SeverityBullet>
         <span class="flex-grow-1">
           {{
-            node[NodeProp.EXCLUSIVE_DURATION]?.toLocaleString(undefined, {
+            node[Property.EXCLUSIVE_DURATION]?.toLocaleString(undefined, {
               minimumFractionDigits: 3,
             }) || "-"
           }}
         </span>
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatDuration(node[NodeProp.EXCLUSIVE_DURATION]) }}
+        {{ formatDuration(node[Property.EXCLUSIVE_DURATION]) }}
         <br />
         <template v-if="executionTimePercent !== Infinity">
           {{ executionTimePercent }}%
@@ -151,26 +151,26 @@ const isHighlighted = computed(
       <template #content>
         <IoTooltip :node="node" class="mb-0" exclusive />
       </template>
-      <template v-if="node[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME]">
+      <template v-if="node[Property.EXCLUSIVE_SUM_IO_READ_TIME]">
         <GridProgressBar
           :percentage="
-            (node[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME] /
-              ((store.plan?.content.Plan[NodeProp.SUM_IO_READ_TIME] ?? 0) +
-                (store.plan?.content.Plan[NodeProp.SUM_IO_WRITE_TIME] ?? 0))) *
+            (node[Property.EXCLUSIVE_SUM_IO_READ_TIME] /
+              ((store.plan?.content.Plan[Property.SUM_IO_READ_TIME] ?? 0) +
+                (store.plan?.content.Plan[Property.SUM_IO_WRITE_TIME] ?? 0))) *
             100
           "
         ></GridProgressBar>
         {{
-          node[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME].toLocaleString(undefined, {
+          node[Property.EXCLUSIVE_SUM_IO_READ_TIME].toLocaleString(undefined, {
             minimumFractionDigits: 3,
           })
         }}
         <div v-if="showDetails" class="text-body-secondary mt-1">
-          {{ formatDuration(node[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME]) }}
+          {{ formatDuration(node[Property.EXCLUSIVE_SUM_IO_READ_TIME]) }}
           <br />
           {{
             formatTransferRate(
-              node[NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED],
+              node[Property.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED],
             )
           }}
         </div>
@@ -184,26 +184,26 @@ const isHighlighted = computed(
       <template #content>
         <IoTooltip :node="node" class="mb-0" exclusive />
       </template>
-      <template v-if="node[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME]">
+      <template v-if="node[Property.EXCLUSIVE_SUM_IO_WRITE_TIME]">
         <GridProgressBar
           :percentage="
-            (node[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME] /
-              ((store.plan?.content.Plan[NodeProp.SUM_IO_READ_TIME] ?? 0) +
-                (store.plan?.content.Plan[NodeProp.SUM_IO_WRITE_TIME] ?? 0))) *
+            (node[Property.EXCLUSIVE_SUM_IO_WRITE_TIME] /
+              ((store.plan?.content.Plan[Property.SUM_IO_READ_TIME] ?? 0) +
+                (store.plan?.content.Plan[Property.SUM_IO_WRITE_TIME] ?? 0))) *
             100
           "
         ></GridProgressBar>
         {{
-          node[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME].toLocaleString(undefined, {
+          node[Property.EXCLUSIVE_SUM_IO_WRITE_TIME].toLocaleString(undefined, {
             minimumFractionDigits: 3,
           })
         }}
         <div v-if="showDetails" class="text-body-secondary mt-1">
-          {{ formatDuration(node[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME]) }}
+          {{ formatDuration(node[Property.EXCLUSIVE_SUM_IO_WRITE_TIME]) }}
           <br />
           {{
             formatTransferRate(
-              node[NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED],
+              node[Property.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED],
             )
           }}
         </div>
@@ -215,7 +215,7 @@ const isHighlighted = computed(
     >
       <GridProgressBar
         :percentage="
-          (node[NodeProp.ACTUAL_ROWS_REVISED] / store.stats.maxRows) * 100
+          (node[Property.ACTUAL_ROWS_REVISED] / store.stats.maxRows) * 100
         "
       ></GridProgressBar>
       <!-- rows -->
@@ -223,7 +223,7 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{ content: rowsTooltip, allowHTML: true }"
       >
-        {{ tilde + node[NodeProp.ACTUAL_ROWS_REVISED]?.toLocaleString() }}
+        {{ tilde + node[Property.ACTUAL_ROWS_REVISED]?.toLocaleString() }}
       </div>
     </td>
     <td
@@ -233,12 +233,12 @@ const isHighlighted = computed(
       <GridProgressBar :percentage="estimateFactorPercent"></GridProgressBar>
       <!-- estimation -->
       <div
-        v-if="node[NodeProp.PLANNER_ESTIMATE_FACTOR] != undefined"
+        v-if="node[Property.PLANNER_ESTIMATE_FACTOR] != undefined"
         v-tippy="{ content: estimateFactorTooltip, allowHTML: true }"
       >
         <div
           class="position-relative d-flex"
-          v-if="node[NodeProp.PLANNER_ESTIMATE_FACTOR] != 1"
+          v-if="node[Property.PLANNER_ESTIMATE_FACTOR] != 1"
         >
           <SeverityBullet
             :severity="estimationClass"
@@ -246,11 +246,11 @@ const isHighlighted = computed(
           ></SeverityBullet>
           <span class="flex-grow-1">
             <span
-              v-html="formatFactor(node[NodeProp.PLANNER_ESTIMATE_FACTOR] || 0)"
+              v-html="formatFactor(node[Property.PLANNER_ESTIMATE_FACTOR] || 0)"
             ></span>
             <span
               v-if="
-                node[NodeProp.PLANNER_ESTIMATE_DIRECTION] ===
+                node[Property.PLANNER_ESTIMATE_DIRECTION] ===
                 EstimateDirection.under
               "
             >
@@ -258,7 +258,7 @@ const isHighlighted = computed(
             </span>
             <span
               v-if="
-                node[NodeProp.PLANNER_ESTIMATE_DIRECTION] ===
+                node[Property.PLANNER_ESTIMATE_DIRECTION] ===
                 EstimateDirection.over
               "
             >
@@ -267,11 +267,11 @@ const isHighlighted = computed(
           </span>
         </div>
         <div
-          v-if="showDetails && node[NodeProp.PLANNER_ESTIMATE_FACTOR] != 1"
+          v-if="showDetails && node[Property.PLANNER_ESTIMATE_FACTOR] != 1"
           class="text-body-secondary mt-1"
         >
           Planned:<br />
-          {{ node[NodeProp.PLAN_ROWS_REVISED]?.toLocaleString() }}
+          {{ node[Property.PLAN_ROWS_REVISED]?.toLocaleString() }}
         </div>
       </div>
     </td>
@@ -282,7 +282,7 @@ const isHighlighted = computed(
       <GridProgressBar
         :percentage="
           Math.round(
-            (node[NodeProp.EXCLUSIVE_COST] / store.stats.maxCost) * 100,
+            (node[Property.EXCLUSIVE_COST] / store.stats.maxCost) * 100,
           )
         "
       ></GridProgressBar>
@@ -293,14 +293,14 @@ const isHighlighted = computed(
       >
         <SeverityBullet :severity="costClass" v-if="costClass"></SeverityBullet>
         <span class="flex-grow-1">
-          {{ formatCost(node[NodeProp.EXCLUSIVE_COST]) }}
+          {{ formatCost(node[Property.EXCLUSIVE_COST]) }}
         </span>
       </div>
     </td>
     <td class="text-end text-nowrap" v-if="columns.includes('loops')">
       <!-- loops -->
-      <span v-if="node[NodeProp.ACTUAL_LOOPS] != 1">
-        {{ node[NodeProp.ACTUAL_LOOPS].toLocaleString() }}
+      <span v-if="node[Property.ACTUAL_LOOPS] != 1">
+        {{ node[Property.ACTUAL_LOOPS].toLocaleString() }}
       </span>
     </td>
     <td
@@ -338,7 +338,7 @@ const isHighlighted = computed(
           v-if="heapFetchesClass"
         ></SeverityBullet>
         <span class="flex-grow-1">
-          {{ node[NodeProp.HEAP_FETCHES]?.toLocaleString() }}
+          {{ node[Property.HEAP_FETCHES]?.toLocaleString() }}
         </span>
       </div>
     </td>
@@ -350,7 +350,7 @@ const isHighlighted = computed(
     >
       <LevelDivider
         :row="row"
-        :isSubplan="!!node[NodeProp.SUBPLAN_NAME]"
+        :isSubplan="!!node[Property.SUBPLAN_NAME]"
       ></LevelDivider>
       <div class="d-inline">
         <b
@@ -370,55 +370,55 @@ const isHighlighted = computed(
 
         <span class="text-body-secondary">
           <template
-            v-if="node[NodeProp.RELATION_NAME] || node[NodeProp.FUNCTION_NAME]"
+            v-if="node[Property.RELATION_NAME] || node[Property.FUNCTION_NAME]"
           >
             <span class="text-body-tertiary">on</span>
-            <span v-if="node[NodeProp.SCHEMA]"
-              >{{ node[NodeProp.SCHEMA] }}.</span
-            >{{ node[NodeProp.RELATION_NAME]
-            }}{{ node[NodeProp.FUNCTION_NAME] }}
-            <span v-if="node[NodeProp.ALIAS]">
+            <span v-if="node[Property.SCHEMA]"
+              >{{ node[Property.SCHEMA] }}.</span
+            >{{ node[Property.RELATION_NAME]
+            }}{{ node[Property.FUNCTION_NAME] }}
+            <span v-if="node[Property.ALIAS]">
               <span class="text-body-tertiary">as</span>
-              {{ node[NodeProp.ALIAS] }}
+              {{ node[Property.ALIAS] }}
             </span>
           </template>
-          <template v-else-if="node[NodeProp.ALIAS]">
+          <template v-else-if="node[Property.ALIAS]">
             <span class="text-body-tertiary">on</span>
-            <span v-html="keysToString(node[NodeProp.ALIAS] as string)"></span>
+            <span v-html="keysToString(node[Property.ALIAS] as string)"></span>
           </template>
-          <template v-if="node[NodeProp.GROUP_KEY]">
+          <template v-if="node[Property.GROUP_KEY]">
             <span class="text-body-tertiary">by</span>
             <span
-              v-html="keysToString(node[NodeProp.GROUP_KEY] as string)"
+              v-html="keysToString(node[Property.GROUP_KEY] as string)"
             ></span>
           </template>
-          <template v-if="node[NodeProp.SORT_KEY]">
+          <template v-if="node[Property.SORT_KEY]">
             <span class="text-body-tertiary">by</span>
             <span
               v-html="
                 sortKeys(
-                  node[NodeProp.SORT_KEY] as string[],
-                  node[NodeProp.PRESORTED_KEY] as string[],
+                  node[Property.SORT_KEY] as string[],
+                  node[Property.PRESORTED_KEY] as string[],
                 )
               "
             ></span>
           </template>
-          <template v-if="node[NodeProp.INDEX_NAME]">
+          <template v-if="node[Property.INDEX_NAME]">
             <span class="text-body-tertiary">using</span>
             <span
-              v-html="keysToString(node[NodeProp.INDEX_NAME] as string)"
+              v-html="keysToString(node[Property.INDEX_NAME] as string)"
             ></span>
           </template>
-          <template v-if="node[NodeProp.HASH_CONDITION]">
+          <template v-if="node[Property.HASH_CONDITION]">
             <span class="text-body-tertiary">on</span>
             <span
-              v-html="keysToString(node[NodeProp.HASH_CONDITION] as string)"
+              v-html="keysToString(node[Property.HASH_CONDITION] as string)"
             ></span>
           </template>
-          <template v-if="node[NodeProp.CTE_NAME]">
+          <template v-if="node[Property.CTE_NAME]">
             <span class="text-reset">
               <span class="text-body-tertiary">CTE</span>
-              {{ node[NodeProp.CTE_NAME] }}
+              {{ node[Property.CTE_NAME] }}
             </span>
           </template>
         </span>
@@ -432,12 +432,12 @@ const isHighlighted = computed(
       >
         <div class="text-wrap">
           <div
-            v-if="getNodeTypeDescription(node[NodeProp.NODE_TYPE])"
+            v-if="getNodeTypeDescription(node[Property.NODE_TYPE])"
             class="node-description mt-1"
           >
-            <span class="node-type">{{ node[NodeProp.NODE_TYPE] }} Node</span>
+            <span class="node-type">{{ node[Property.NODE_TYPE] }} Node</span>
             <span
-              v-html="getNodeTypeDescription(node[NodeProp.NODE_TYPE])"
+              v-html="getNodeTypeDescription(node[Property.NODE_TYPE])"
             ></span>
           </div>
           <ul class="nav nav-tabs mt-1">
@@ -455,7 +455,7 @@ const isHighlighted = computed(
                 class="nav-link px-2 py-1"
                 :class="{
                   active: activeTab === 'output',
-                  disabled: !node[NodeProp.OUTPUT],
+                  disabled: !node[Property.OUTPUT],
                 }"
                 @click.prevent.stop="activeTab = 'output'"
                 href=""
@@ -468,8 +468,8 @@ const isHighlighted = computed(
                 :class="{
                   active: activeTab === 'workers',
                   disabled: !(
-                    node[NodeProp.WORKERS_PLANNED] ||
-                    node[NodeProp.WORKERS_PLANNED_BY_GATHER]
+                    node[Property.WORKERS_PLANNED] ||
+                    node[Property.WORKERS_PLANNED_BY_GATHER]
                   ),
                 }"
                 @click.prevent.stop="activeTab = 'workers'"
@@ -511,14 +511,14 @@ const isHighlighted = computed(
       <div
         class="position-relative"
         v-tippy="{
-          content: buffersByMetricTooltip(NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS),
+          content: buffersByMetricTooltip(Property.EXCLUSIVE_SHARED_HIT_BLOCKS),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -530,15 +530,15 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS,
+            Property.EXCLUSIVE_SHARED_READ_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_SHARED_READ_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_SHARED_READ_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -550,16 +550,16 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS,
+            Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
         {{
-          formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS])
+          formatBlocksAsBytes(node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS])
         }}
       </div>
     </td>
@@ -572,16 +572,16 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS,
+            Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
         {{
-          formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS])
+          formatBlocksAsBytes(node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS])
         }}
       </div>
     </td>
@@ -593,14 +593,14 @@ const isHighlighted = computed(
       <div
         class="position-relative"
         v-tippy="{
-          content: buffersByMetricTooltip(NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS),
+          content: buffersByMetricTooltip(Property.EXCLUSIVE_TEMP_READ_BLOCKS),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_TEMP_READ_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_TEMP_READ_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -612,15 +612,15 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS,
+            Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -631,14 +631,14 @@ const isHighlighted = computed(
       <div
         class="position-relative"
         v-tippy="{
-          content: buffersByMetricTooltip(NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS),
+          content: buffersByMetricTooltip(Property.EXCLUSIVE_LOCAL_HIT_BLOCKS),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -649,14 +649,14 @@ const isHighlighted = computed(
       <div
         class="position-relative"
         v-tippy="{
-          content: buffersByMetricTooltip(NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS),
+          content: buffersByMetricTooltip(Property.EXCLUSIVE_LOCAL_READ_BLOCKS),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -668,15 +668,15 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS,
+            Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]) }}
       </div>
     </td>
     <td
@@ -688,15 +688,15 @@ const isHighlighted = computed(
         class="position-relative"
         v-tippy="{
           content: buffersByMetricTooltip(
-            NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS,
+            Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS,
           ),
           allowHTML: true,
         }"
       >
-        {{ formatBlocks(node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]) }}
+        {{ formatBlocks(node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]) }}
       </div>
       <div v-if="showDetails" class="text-body-secondary mt-1">
-        {{ formatBlocksAsBytes(node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]) }}
+        {{ formatBlocksAsBytes(node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]) }}
       </div>
     </td>
   </tr>
diff --git a/src/components/IoTimingsRow.vue b/src/components/IoTimingsRow.vue
index 83e3b115..2f961855 100644
--- a/src/components/IoTimingsRow.vue
+++ b/src/components/IoTimingsRow.vue
@@ -2,7 +2,7 @@
 import { inject, reactive } from "vue"
 import * as _ from "lodash"
 import type { Node, ViewOptions } from "@/interfaces"
-import { NodeProp, Scope } from "@/enums"
+import { Property, Scope } from "@/enums"
 import { ViewOptionsKey } from "@/symbols"
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 import { directive as vTippy } from "vue-tippy"
@@ -29,34 +29,34 @@ const scope = props.scope ? `${props.scope}_`.toUpperCase() : ""
 const name = props.scope ? _.capitalize(props.scope) : "Shared/Local"
 const readTimeProp = (exclusivePrefix +
   scope +
-  "IO_READ_TIME") as keyof typeof NodeProp
+  "IO_READ_TIME") as keyof typeof Property
 const readSpeedProp = (exclusivePrefix +
   "AVERAGE_" +
   scope +
-  "IO_READ_SPEED") as keyof typeof NodeProp
+  "IO_READ_SPEED") as keyof typeof Property
 const readBlocksProp = (exclusivePrefix +
   scope +
-  "READ_BLOCKS") as keyof typeof NodeProp
+  "READ_BLOCKS") as keyof typeof Property
 const writeTimeProp = (exclusivePrefix +
   scope +
-  "IO_WRITE_TIME") as keyof typeof NodeProp
+  "IO_WRITE_TIME") as keyof typeof Property
 const writeSpeedProp = (exclusivePrefix +
   "AVERAGE_" +
   scope +
-  "IO_WRITE_SPEED") as keyof typeof NodeProp
+  "IO_WRITE_SPEED") as keyof typeof Property
 const writtenBlocksProp = (exclusivePrefix +
   scope +
-  "WRITTEN_BLOCKS") as keyof typeof NodeProp
+  "WRITTEN_BLOCKS") as keyof typeof Property
 </script>
 
 <template>
   <tr>
     <td>{{ name }}</td>
-    <td class="text-end" v-if="node[NodeProp[readTimeProp]]">
+    <td class="text-end" v-if="node[Property[readTimeProp]]">
       {{ formattedProp(readTimeProp) }}
       <br />
       <small>{{
-        formatBlocksAsBytes(node[NodeProp[readBlocksProp]] as number)
+        formatBlocksAsBytes(node[Property[readBlocksProp]] as number)
       }}</small>
       <br />
       <small>~{{ formattedProp(readSpeedProp) }}</small>
@@ -67,17 +67,17 @@ const writtenBlocksProp = (exclusivePrefix +
           content: getHelpMessage('io timings parallel'),
         }"
         v-if="
-          node[NodeProp.WORKERS_PLANNED] ||
-          node[NodeProp.WORKERS_PLANNED_BY_GATHER]
+          node[Property.WORKERS_PLANNED] ||
+          node[Property.WORKERS_PLANNED_BY_GATHER]
         "
       ></FontAwesomeIcon>
     </td>
     <td class="text-end" v-else>-</td>
-    <td class="text-end" v-if="node[NodeProp[writeTimeProp]]">
+    <td class="text-end" v-if="node[Property[writeTimeProp]]">
       {{ formattedProp(writeTimeProp) }}
       <br />
       <small>{{
-        formatBlocksAsBytes(node[NodeProp[writtenBlocksProp]] as number)
+        formatBlocksAsBytes(node[Property[writtenBlocksProp]] as number)
       }}</small>
       <br />
       <small>~{{ formattedProp(writeSpeedProp) }}</small>
diff --git a/src/components/MiscDetail.vue b/src/components/MiscDetail.vue
index 96680c34..afb0c6e1 100644
--- a/src/components/MiscDetail.vue
+++ b/src/components/MiscDetail.vue
@@ -2,12 +2,12 @@
 import { onBeforeMount, reactive, ref } from "vue"
 import _ from "lodash"
 import type { Node } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 import { shouldShowProp } from "@/services/help-service"
-import { formatNodeProp } from "@/filters"
+import { formatProp } from "@/filters"
 const nodeProps = ref<
   {
-    key: keyof typeof NodeProp
+    key: keyof typeof Property
     value: unknown
   }[]
 >()
@@ -26,10 +26,10 @@ onBeforeMount(() => {
 // create an array of node propeties so that they can be displayed in the view
 function calculateProps() {
   nodeProps.value = _.chain(node)
-    .omit(NodeProp.PLANS)
-    .omit(NodeProp.WORKERS)
+    .omit(Property.PLANS)
+    .omit(Property.WORKERS)
     .map((value, key) => {
-      return { key: key as keyof typeof NodeProp, value }
+      return { key: key as keyof typeof Property, value }
     })
     .value()
 }
@@ -39,7 +39,7 @@ function calculateProps() {
     <template v-for="(prop, key) in nodeProps" :key="key">
       <tr v-if="shouldShowProp(prop.key, prop.value)">
         <td width="40%">{{ prop.key }}</td>
-        <td v-html="formatNodeProp(prop.key, prop.value)"></td>
+        <td v-html="formatProp(prop.key, prop.value)"></td>
       </tr>
     </template>
   </table>
diff --git a/src/components/Plan.vue b/src/components/Plan.vue
index 95b78c37..8c154a31 100644
--- a/src/components/Plan.vue
+++ b/src/components/Plan.vue
@@ -28,7 +28,7 @@ import PlanStats from "@/components/PlanStats.vue"
 import Stats from "@/components/Stats.vue"
 import AnimatedEdge from "@/components/AnimatedEdge.vue"
 import { findNodeById } from "@/services/help-service"
-import { HighlightType, NodeProp } from "@/enums"
+import { HighlightType, Property } from "@/enums"
 import { json_, pgsql_ } from "@/filters"
 import { setDefaultProps } from "vue-tippy"
 import { store } from "@/store"
@@ -171,11 +171,11 @@ function doLayout() {
   // compute links from node to CTE
   toCteLinks.value = []
   _.each(layoutRootNode.value.descendants(), (source) => {
-    if (_.has(source.data, NodeProp.CTE_NAME)) {
+    if (_.has(source.data, Property.CTE_NAME)) {
       const cte = _.find(ctes.value, (cteNode) => {
         return (
-          cteNode.data[NodeProp.SUBPLAN_NAME] ==
-          "CTE " + source.data[NodeProp.CTE_NAME]
+          cteNode.data[Property.SUBPLAN_NAME] ==
+          "CTE " + source.data[Property.CTE_NAME]
         )
       })
       if (cte) {
@@ -190,11 +190,11 @@ function doLayout() {
   // compute links from node in CTE to other CTE
   _.each(ctes.value, (cte) => {
     _.each(cte.descendants(), (sourceCte) => {
-      if (_.has(sourceCte.data, NodeProp.CTE_NAME)) {
+      if (_.has(sourceCte.data, Property.CTE_NAME)) {
         const targetCte = _.find(ctes.value, (cteNode) => {
           return (
-            cteNode.data[NodeProp.SUBPLAN_NAME] ==
-            "CTE " + sourceCte.data[NodeProp.CTE_NAME]
+            cteNode.data[Property.SUBPLAN_NAME] ==
+            "CTE " + sourceCte.data[Property.CTE_NAME]
           )
         })
         if (targetCte) {
@@ -377,7 +377,7 @@ function getLayoutExtent(
 }
 
 function isNeverExecuted(node: Node): boolean {
-  return !!store.stats.executionTime && !node[NodeProp.ACTUAL_LOOPS]
+  return !!store.stats.executionTime && !node[Property.ACTUAL_LOOPS]
 }
 
 watch(
@@ -578,7 +578,7 @@ function updateNodeSize(node: Node, size: [number, number]) {
                         "
                         :disabled="
                           !rootNode ||
-                          rootNode[NodeProp.ACTUAL_ROWS] === undefined
+                          rootNode[Property.ACTUAL_ROWS] === undefined
                         "
                       >
                         rows
@@ -607,7 +607,7 @@ function updateNodeSize(node: Node, size: [number, number]) {
                         stroke-color="#B3D7D7"
                         :stroke-width="
                           edgeWeight(
-                            link.target.data[NodeProp.ACTUAL_ROWS_REVISED],
+                            link.target.data[Property.ACTUAL_ROWS_REVISED],
                           )
                         "
                       />
@@ -621,7 +621,7 @@ function updateNodeSize(node: Node, size: [number, number]) {
                         stroke-color="grey"
                         :stroke-width="
                           edgeWeight(
-                            link.target.data[NodeProp.ACTUAL_ROWS_REVISED],
+                            link.target.data[Property.ACTUAL_ROWS_REVISED],
                           )
                         "
                       />
@@ -665,7 +665,7 @@ function updateNodeSize(node: Node, size: [number, number]) {
                           stroke-color="grey"
                           :stroke-width="
                             edgeWeight(
-                              link.target.data[NodeProp.ACTUAL_ROWS_REVISED],
+                              link.target.data[Property.ACTUAL_ROWS_REVISED],
                             )
                           "
                         />
diff --git a/src/components/PlanNode.vue b/src/components/PlanNode.vue
index 6e02cfe4..d4149db6 100644
--- a/src/components/PlanNode.vue
+++ b/src/components/PlanNode.vue
@@ -11,7 +11,7 @@ import {
   ViewOptionsKey,
 } from "@/symbols"
 import { keysToString, sortKeys } from "@/filters"
-import { HighlightType, NodeProp } from "@/enums"
+import { HighlightType, Property } from "@/enums"
 import { findNodeBySubplanName } from "@/services/help-service"
 import useNode from "@/node"
 import { store } from "@/store"
@@ -90,7 +90,7 @@ watch(selectedNodeId, () => {
 function centerCte() {
   const cteNode = findNodeBySubplanName(
     store.plan as IPlan,
-    node[NodeProp.CTE_NAME] as string,
+    node[Property.CTE_NAME] as string,
   )
   if (cteNode) {
     selectNode?.(cteNode.nodeId, true)
@@ -111,9 +111,9 @@ function centerCte() {
         },
       ]"
     >
-      <div v-if="node[NodeProp.SUBPLAN_NAME]" class="fixed-bottom text-center">
+      <div v-if="node[Property.SUBPLAN_NAME]" class="fixed-bottom text-center">
         <b class="subplan-name fst-italic px-1">
-          {{ node[NodeProp.SUBPLAN_NAME] }}
+          {{ node[Property.SUBPLAN_NAME] }}
         </b>
       </div>
       <div
@@ -175,78 +175,78 @@ function centerCte() {
           <div class="text-start font-monospace">
             <div
               v-if="
-                node[NodeProp.RELATION_NAME] || node[NodeProp.FUNCTION_NAME]
+                node[Property.RELATION_NAME] || node[Property.FUNCTION_NAME]
               "
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">on</span>
-              <span v-if="node[NodeProp.SCHEMA]"
-                >{{ node[NodeProp.SCHEMA] }}.</span
-              >{{ node[NodeProp.RELATION_NAME] }}
-              {{ node[NodeProp.FUNCTION_NAME] }}
-              <span v-if="node[NodeProp.ALIAS]">
+              <span v-if="node[Property.SCHEMA]"
+                >{{ node[Property.SCHEMA] }}.</span
+              >{{ node[Property.RELATION_NAME] }}
+              {{ node[Property.FUNCTION_NAME] }}
+              <span v-if="node[Property.ALIAS]">
                 <span class="text-body-tertiary">as</span>
-                {{ node[NodeProp.ALIAS] }}
+                {{ node[Property.ALIAS] }}
               </span>
             </div>
             <div
-              v-else-if="node[NodeProp.ALIAS]"
+              v-else-if="node[Property.ALIAS]"
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">on</span>
               <span
-                v-html="keysToString(node[NodeProp.ALIAS] as string)"
+                v-html="keysToString(node[Property.ALIAS] as string)"
               ></span>
             </div>
             <div
-              v-if="node[NodeProp.GROUP_KEY]"
+              v-if="node[Property.GROUP_KEY]"
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">by</span>
               <span
-                v-html="keysToString(node[NodeProp.GROUP_KEY] as string)"
+                v-html="keysToString(node[Property.GROUP_KEY] as string)"
               ></span>
             </div>
             <div
-              v-if="node[NodeProp.SORT_KEY]"
+              v-if="node[Property.SORT_KEY]"
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">by</span>
               <span
                 v-html="
                   sortKeys(
-                    node[NodeProp.SORT_KEY] as string[],
-                    node[NodeProp.PRESORTED_KEY] as string[],
+                    node[Property.SORT_KEY] as string[],
+                    node[Property.PRESORTED_KEY] as string[],
                   )
                 "
               ></span>
             </div>
             <div
-              v-if="node[NodeProp.INDEX_NAME]"
+              v-if="node[Property.INDEX_NAME]"
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">using</span>
               <span
-                v-html="keysToString(node[NodeProp.INDEX_NAME] as string)"
+                v-html="keysToString(node[Property.INDEX_NAME] as string)"
               ></span>
             </div>
             <div
-              v-if="node[NodeProp.HASH_CONDITION]"
+              v-if="node[Property.HASH_CONDITION]"
               :class="{ 'line-clamp-2': !showDetails }"
             >
               <span class="text-body-tertiary">on</span>
               <span
-                v-html="keysToString(node[NodeProp.HASH_CONDITION] as string)"
+                v-html="keysToString(node[Property.HASH_CONDITION] as string)"
               ></span>
             </div>
-            <div v-if="node[NodeProp.CTE_NAME]">
+            <div v-if="node[Property.CTE_NAME]">
               <a class="text-reset" href="" @click.prevent.stop="centerCte">
                 <FontAwesomeIcon
                   :icon="faSearch"
                   class="text-body-tertiary"
                 ></FontAwesomeIcon>
                 <span class="text-body-tertiary">CTE</span>
-                {{ node[NodeProp.CTE_NAME] }}
+                {{ node[Property.CTE_NAME] }}
               </a>
             </div>
           </div>
diff --git a/src/components/PlanNodeDetail.vue b/src/components/PlanNodeDetail.vue
index 33017d7a..d0f03685 100644
--- a/src/components/PlanNodeDetail.vue
+++ b/src/components/PlanNodeDetail.vue
@@ -3,7 +3,7 @@ import { computed, inject, onBeforeMount, reactive, ref, watch } from "vue"
 import { directive as vTippy } from "vue-tippy"
 import type { Node, ViewOptions } from "@/interfaces"
 import { getNodeTypeDescription } from "@/services/help-service"
-import { EstimateDirection, NodeProp } from "@/enums"
+import { EstimateDirection, Property } from "@/enums"
 import useNode from "@/node"
 import { store } from "@/store"
 import IoTooltip from "@/components/tooltip/IoTooltip.vue"
@@ -37,7 +37,7 @@ const updateSize = inject<(node: Node) => null>("updateSize")
 const node = reactive<Node>(props.node)
 const nodeProps = ref<
   {
-    key: keyof typeof NodeProp
+    key: keyof typeof Property
     value: unknown
   }[]
 >()
@@ -78,16 +78,16 @@ const shouldShowPlannerEstimate = computed(() => {
 // create an array of node propeties so that they can be displayed in the view
 function calculateProps() {
   nodeProps.value = _.chain(node)
-    .omit(NodeProp.PLANS)
-    .omit(NodeProp.WORKERS)
+    .omit(Property.PLANS)
+    .omit(Property.WORKERS)
     .map((value, key) => {
-      return { key: key as keyof typeof NodeProp, value }
+      return { key: key as keyof typeof Property, value }
     })
     .value()
 }
 
 const shouldShowIoBuffers = computed((): boolean => {
-  const properties: Array<keyof typeof NodeProp> = [
+  const properties: Array<keyof typeof Property> = [
     "EXCLUSIVE_SHARED_HIT_BLOCKS",
     "EXCLUSIVE_SHARED_READ_BLOCKS",
     "EXCLUSIVE_SHARED_DIRTIED_BLOCKS",
@@ -102,7 +102,7 @@ const shouldShowIoBuffers = computed((): boolean => {
     "EXCLUSIVE_IO_WRITE_TIME",
   ]
   const values = _.map(properties, (property) => {
-    const value = node[NodeProp[property]]
+    const value = node[Property[property]]
     return _.isNaN(value) ? 0 : value
   })
   const sum = _.sum(values)
@@ -117,11 +117,11 @@ watch(activeTab, () => {
 <template>
   <div class="card-header border-top">
     <div
-      v-if="getNodeTypeDescription(node[NodeProp.NODE_TYPE])"
+      v-if="getNodeTypeDescription(node[Property.NODE_TYPE])"
       class="node-description"
     >
-      <span class="node-type">{{ node[NodeProp.NODE_TYPE] }} Node</span>
-      <span v-html="getNodeTypeDescription(node[NodeProp.NODE_TYPE])"></span>
+      <span class="node-type">{{ node[Property.NODE_TYPE] }} Node</span>
+      <span v-html="getNodeTypeDescription(node[Property.NODE_TYPE])"></span>
     </div>
     <ul class="nav nav-tabs card-header-tabs">
       <li class="nav-item">
@@ -150,7 +150,7 @@ watch(activeTab, () => {
           class="nav-link"
           :class="{
             active: activeTab === 'output',
-            disabled: !node[NodeProp.OUTPUT],
+            disabled: !node[Property.OUTPUT],
           }"
           @click.prevent.stop="activeTab = 'output'"
           href=""
@@ -163,8 +163,8 @@ watch(activeTab, () => {
           :class="{
             active: activeTab === 'workers',
             disabled: !(
-              node[NodeProp.WORKERS_PLANNED] ||
-              node[NodeProp.WORKERS_PLANNED_BY_GATHER]
+              node[Property.WORKERS_PLANNED] ||
+              node[Property.WORKERS_PLANNED_BY_GATHER]
             ),
           }"
           @click.prevent.stop="activeTab = 'workers'"
@@ -216,7 +216,7 @@ watch(activeTab, () => {
         <span class="px-1">{{
           tilde + formattedProp("ACTUAL_ROWS_REVISED")
         }}</span>
-        <span class="text-body-tertiary" v-if="node[NodeProp.PLAN_ROWS]"
+        <span class="text-body-tertiary" v-if="node[Property.PLAN_ROWS]"
           >(Planned: {{ tilde + formattedProp("PLAN_ROWS_REVISED") }})</span
         >
         <span
@@ -249,7 +249,7 @@ watch(activeTab, () => {
           :icon="faFilter"
           class="text-body-tertiary"
         ></FontAwesomeIcon>
-        <b> {{ NodeProp[rowsRemovedProp] }}: </b>
+        <b> {{ Property[rowsRemovedProp] }}: </b>
         <span>
           <span class="px-1">{{ tilde + formattedProp(rowsRemovedProp) }}</span
           >|
@@ -272,7 +272,7 @@ watch(activeTab, () => {
           v-else
         ></FontAwesomeIcon>
       </div>
-      <div v-if="node[NodeProp.HEAP_FETCHES]">
+      <div v-if="node[Property.HEAP_FETCHES]">
         <FontAwesomeIcon
           fixed-width
           :icon="faExchangeAlt"
@@ -296,7 +296,7 @@ watch(activeTab, () => {
           }"
         ></FontAwesomeIcon>
       </div>
-      <div v-if="!_.isUndefined(node[NodeProp.EXCLUSIVE_COST])">
+      <div v-if="!_.isUndefined(node[Property.EXCLUSIVE_COST])">
         <FontAwesomeIcon
           fixed-width
           :icon="faDollarSign"
@@ -310,7 +310,7 @@ watch(activeTab, () => {
           >(Total: {{ formattedProp("TOTAL_COST") }})</span
         >
       </div>
-      <div v-if="node[NodeProp.ACTUAL_LOOPS] > 1">
+      <div v-if="node[Property.ACTUAL_LOOPS] > 1">
         <FontAwesomeIcon
           fixed-width
           :icon="faUndo"
@@ -326,7 +326,7 @@ watch(activeTab, () => {
       <IoTooltip :node="node" exclusive />
       <BuffersDetail :object="node" />
       <div
-        v-if="node[NodeProp.WAL_RECORDS] || node[NodeProp.WAL_BYTES]"
+        v-if="node[Property.WAL_RECORDS] || node[Property.WAL_BYTES]"
         class="mb-2"
       >
         <b>
@@ -334,7 +334,7 @@ watch(activeTab, () => {
         </b>
         {{ formattedProp("WAL_RECORDS") }} records
         <small>({{ formattedProp("WAL_BYTES") }})</small>
-        <span v-if="node[NodeProp.WAL_FPI]">
+        <span v-if="node[Property.WAL_FPI]">
           -
           <span class="more-info" v-tippy="'WAL Full Page Images'">FPI</span>:
           {{ formattedProp("WAL_FPI") }}
@@ -353,8 +353,8 @@ watch(activeTab, () => {
       class="tab-pane"
       :class="{ 'show active': activeTab === 'workers' }"
       v-if="
-        node[NodeProp.WORKERS_PLANNED] ||
-        node[NodeProp.WORKERS_PLANNED_BY_GATHER]
+        node[Property.WORKERS_PLANNED] ||
+        node[Property.WORKERS_PLANNED_BY_GATHER]
       "
     >
       <!-- workers tab -->
diff --git a/src/components/PlanStats.vue b/src/components/PlanStats.vue
index 6ee984e2..21adbff3 100644
--- a/src/components/PlanStats.vue
+++ b/src/components/PlanStats.vue
@@ -1,13 +1,12 @@
 <script lang="ts" setup>
 import _ from "lodash"
 import { computed, ref } from "vue"
-import type { ITrigger, Node } from "@/interfaces"
+import type { ISerialization, ITrigger, Node } from "@/interfaces"
 import { getHelpMessage } from "@/services/help-service"
 import { formatDuration, durationClass, formatKilobytes } from "@/filters"
 import { directive as vTippy } from "vue-tippy"
-import { NodeProp } from "../enums"
-import { BuffersProp } from "../enums"
-import { formatNodeProp } from "@/filters"
+import { Property } from "../enums"
+import { formatProp } from "@/filters"
 import JitDetails from "@/components/JitDetails.vue"
 import BuffersDetail from "@/components/BuffersDetail.vue"
 import IoTooltip from "@/components/tooltip/IoTooltip.vue"
@@ -54,17 +53,17 @@ const triggersTotalDuration = computed(() => {
 })
 
 function averageIO(node: Node) {
-  const readAverage = node[NodeProp.AVERAGE_SUM_IO_READ_SPEED]
-  const writeAverage = node[NodeProp.AVERAGE_SUM_IO_WRITE_SPEED]
+  const readAverage = node[Property.AVERAGE_SUM_IO_READ_SPEED]
+  const writeAverage = node[Property.AVERAGE_SUM_IO_WRITE_SPEED]
   const r = []
   if (readAverage) {
     r.push(
-      `read=~${formatNodeProp(NodeProp.AVERAGE_SUM_IO_READ_SPEED, readAverage)}`,
+      `read=~${formatProp(Property.AVERAGE_SUM_IO_READ_SPEED, readAverage)}`,
     )
   }
   if (writeAverage) {
     r.push(
-      `write=~${formatNodeProp(NodeProp.AVERAGE_SUM_IO_WRITE_SPEED, writeAverage)}`,
+      `write=~${formatProp(Property.AVERAGE_SUM_IO_WRITE_SPEED, writeAverage)}`,
     )
   }
   return r.join(", ")
@@ -72,7 +71,7 @@ function averageIO(node: Node) {
 
 function hasParallelChildren(node: Node) {
   return node.Plans?.some(function iter(a) {
-    if (a[NodeProp.WORKERS_PLANNED] || a[NodeProp.WORKERS_PLANNED_BY_GATHER]) {
+    if (a[Property.WORKERS_PLANNED] || a[Property.WORKERS_PLANNED_BY_GATHER]) {
       return true
     }
     return Array.isArray(a.Plans) && a.Plans.some(iter)
@@ -83,20 +82,20 @@ const shouldShowSerializationBuffers = computed((): boolean => {
   if (!store.stats.serialization) {
     return false
   }
-  const properties: Array<keyof typeof BuffersProp> = [
-    "SHARED_HIT_BLOCKS",
-    "SHARED_READ_BLOCKS",
-    "SHARED_DIRTIED_BLOCKS",
-    "SHARED_WRITTEN_BLOCKS",
-    "TEMP_READ_BLOCKS",
-    "TEMP_WRITTEN_BLOCKS",
-    "LOCAL_HIT_BLOCKS",
-    "LOCAL_READ_BLOCKS",
-    "LOCAL_DIRTIED_BLOCKS",
-    "LOCAL_WRITTEN_BLOCKS",
+  const properties: (keyof ISerialization)[] = [
+    Property.SHARED_HIT_BLOCKS,
+    Property.SHARED_READ_BLOCKS,
+    Property.SHARED_DIRTIED_BLOCKS,
+    Property.SHARED_WRITTEN_BLOCKS,
+    Property.TEMP_READ_BLOCKS,
+    Property.TEMP_WRITTEN_BLOCKS,
+    Property.LOCAL_HIT_BLOCKS,
+    Property.LOCAL_READ_BLOCKS,
+    Property.LOCAL_DIRTIED_BLOCKS,
+    Property.LOCAL_WRITTEN_BLOCKS,
   ]
   const values = _.map(properties, (property) => {
-    const value = store.stats.serialization?.[BuffersProp[property]]
+    const value = store.stats.serialization?.[property]
     return _.isNaN(value) ? 0 : value
   })
   const sum = _.sum(values)
diff --git a/src/components/Stats.vue b/src/components/Stats.vue
index 3f28ece5..456eb844 100644
--- a/src/components/Stats.vue
+++ b/src/components/Stats.vue
@@ -2,7 +2,7 @@
 import _ from "lodash"
 import { computed } from "vue"
 import type { Node, StatsTableItemType } from "@/interfaces"
-import { NodeProp, SortDirection } from "@/enums"
+import { Property, SortDirection } from "@/enums"
 import SortedTable from "@/components/SortedTable.vue"
 import SortLink from "@/components/SortLink.vue"
 import StatsTableItem from "@/components/StatsTableItem.vue"
@@ -11,26 +11,26 @@ import { store } from "@/store"
 const executionTime = computed(
   () =>
     store.stats.executionTime ||
-    (store.plan?.content.Plan?.[NodeProp.ACTUAL_TOTAL_TIME] as number),
+    (store.plan?.content.Plan?.[Property.ACTUAL_TOTAL_TIME] as number),
 )
 
 const nodes = computed(() => _.flatten(store.flat).map((row) => row.node))
 
 function durationPercent(nodes: Node[]) {
-  return _.sumBy(nodes, NodeProp.EXCLUSIVE_DURATION) / executionTime.value
+  return _.sumBy(nodes, Property.EXCLUSIVE_DURATION) / executionTime.value
 }
 
 const perTable = computed(() => {
   const tables: { [key: string]: Node[] } = _.groupBy(
-    _.filter(nodes.value, (n) => n[NodeProp.RELATION_NAME] !== undefined),
-    NodeProp.RELATION_NAME,
+    _.filter(nodes.value, (n) => n[Property.RELATION_NAME] !== undefined),
+    Property.RELATION_NAME,
   )
   const values: StatsTableItemType[] = []
   _.each(tables, (nodes, tableName) => {
     values.push({
       name: tableName,
       count: nodes.length,
-      time: _.sumBy(nodes, NodeProp.EXCLUSIVE_DURATION),
+      time: _.sumBy(nodes, Property.EXCLUSIVE_DURATION),
       timePercent: durationPercent(nodes),
       nodes,
     })
@@ -40,15 +40,15 @@ const perTable = computed(() => {
 
 const perFunction = computed(() => {
   const functions: { [key: string]: Node[] } = _.groupBy(
-    _.filter(nodes.value, (n) => n[NodeProp.FUNCTION_NAME] !== undefined),
-    NodeProp.FUNCTION_NAME,
+    _.filter(nodes.value, (n) => n[Property.FUNCTION_NAME] !== undefined),
+    Property.FUNCTION_NAME,
   )
   const values: StatsTableItemType[] = []
   _.each(functions, (nodes, functionName) => {
     values.push({
       name: functionName,
       count: nodes.length,
-      time: _.sumBy(nodes, NodeProp.EXCLUSIVE_DURATION),
+      time: _.sumBy(nodes, Property.EXCLUSIVE_DURATION),
       timePercent: durationPercent(nodes),
       nodes,
     })
@@ -59,14 +59,14 @@ const perFunction = computed(() => {
 const perNodeType = computed(() => {
   const nodeTypes: { [key: string]: Node[] } = _.groupBy(
     nodes.value,
-    NodeProp.NODE_TYPE,
+    Property.NODE_TYPE,
   )
   const values: StatsTableItemType[] = []
   _.each(nodeTypes, (nodes, nodeType) => {
     values.push({
       name: nodeType,
       count: nodes.length,
-      time: _.sumBy(nodes, NodeProp.EXCLUSIVE_DURATION),
+      time: _.sumBy(nodes, Property.EXCLUSIVE_DURATION),
       timePercent: durationPercent(nodes),
       nodes,
     })
@@ -76,15 +76,15 @@ const perNodeType = computed(() => {
 
 const perIndex = computed(() => {
   const indexes: { [key: string]: Node[] } = _.groupBy(
-    _.filter(nodes.value, (n) => n[NodeProp.INDEX_NAME] !== undefined),
-    NodeProp.INDEX_NAME,
+    _.filter(nodes.value, (n) => n[Property.INDEX_NAME] !== undefined),
+    Property.INDEX_NAME,
   )
   const values: StatsTableItemType[] = []
   _.each(indexes, (nodes, indexName) => {
     values.push({
       name: indexName,
       count: nodes.length,
-      time: _.sumBy(nodes, NodeProp.EXCLUSIVE_DURATION),
+      time: _.sumBy(nodes, Property.EXCLUSIVE_DURATION),
       timePercent: durationPercent(nodes),
       nodes,
     })
diff --git a/src/components/StatsTableItem.vue b/src/components/StatsTableItem.vue
index 21f0b40f..ef7e17ac 100644
--- a/src/components/StatsTableItem.vue
+++ b/src/components/StatsTableItem.vue
@@ -2,7 +2,7 @@
 import _ from "lodash"
 import { ref } from "vue"
 import type { Node, StatsTableItemType } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 import { formatDuration, durationClass, formatPercent } from "@/filters"
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 import {
@@ -21,7 +21,7 @@ const expanded = ref<boolean>(false)
 
 function durationPercent(node: Node) {
   return (
-    (node[NodeProp.EXCLUSIVE_DURATION] as number) /
+    (node[Property.EXCLUSIVE_DURATION] as number) /
     (props.executionTime as number)
   )
 }
@@ -58,7 +58,7 @@ function durationPercent(node: Node) {
   <tbody :class="expanded ? '' : 'd-none'">
     <tr
       v-for="node in _.reverse(
-        _.sortBy(props.value.nodes, NodeProp.EXCLUSIVE_DURATION),
+        _.sortBy(props.value.nodes, Property.EXCLUSIVE_DURATION),
       )"
       :key="node.nodeId"
       style="font-size: smaller"
@@ -67,12 +67,12 @@ function durationPercent(node: Node) {
         <a :href="`#plan/node/${node.nodeId}`" class="me-1"
           >#{{ node.nodeId }}</a
         >
-        {{ node[NodeProp.NODE_TYPE] }}
+        {{ node[Property.NODE_TYPE] }}
       </td>
       <td class="text-end"></td>
       <td class="text-end">
         <span class="px-1">
-          {{ formatDuration(node[NodeProp.EXCLUSIVE_DURATION]) }}
+          {{ formatDuration(node[Property.EXCLUSIVE_DURATION]) }}
         </span>
       </td>
       <td class="text-end">
diff --git a/src/components/WorkersDetail.vue b/src/components/WorkersDetail.vue
index 7f95d85b..84deccdf 100644
--- a/src/components/WorkersDetail.vue
+++ b/src/components/WorkersDetail.vue
@@ -2,11 +2,11 @@
 import { inject, reactive } from "vue"
 import _ from "lodash"
 import type { Node, ViewOptions } from "@/interfaces"
-import { NodeProp, WorkerProp } from "@/enums"
+import { Property } from "@/enums"
 import { ViewOptionsKey } from "@/symbols"
 import { getHelpMessage } from "@/services/help-service"
 import useNode from "@/node"
-import { formatNodeProp } from "@/filters"
+import { formatProp } from "@/filters"
 import { directive as vTippy } from "vue-tippy"
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"
 import { faExclamationTriangle } from "@fortawesome/free-solid-svg-icons"
@@ -28,8 +28,8 @@ const { workersLaunchedCount, workersPlannedCount } = useNode(node, viewOptions)
     <span class="px-1">{{ workersPlannedCount }} </span>
     <em
       v-if="
-        !node[NodeProp.WORKERS_PLANNED] &&
-        !node[NodeProp.WORKERS] &&
+        !node[Property.WORKERS_PLANNED] &&
+        !node[Property.WORKERS] &&
         (!store.plan?.isVerbose || !store.plan?.isAnalyze)
       "
       class="text-warning"
@@ -46,8 +46,8 @@ const { workersLaunchedCount, workersPlannedCount } = useNode(node, viewOptions)
     <span class="px-1">{{ workersLaunchedCount }}</span>
     <em
       v-if="
-        !node[NodeProp.WORKERS_LAUNCHED] &&
-        !node[NodeProp.WORKERS] &&
+        !node[Property.WORKERS_LAUNCHED] &&
+        !node[Property.WORKERS] &&
         (!store.plan?.isVerbose || !store.plan?.isAnalyze)
       "
       class="text-warning"
@@ -61,15 +61,15 @@ const { workersLaunchedCount, workersPlannedCount } = useNode(node, viewOptions)
   </div>
 
   <div
-    v-if="_.isArray(node[NodeProp.WORKERS])"
+    v-if="_.isArray(node[Property.WORKERS])"
     class="overflow-auto"
     style="max-height: 300px"
     @wheel.stop
   >
-    <template v-for="(worker, index) in node[NodeProp.WORKERS]" :key="index">
+    <template v-for="(worker, index) in node[Property.WORKERS]" :key="index">
       <div class="card mt-2">
         <div class="card-header">
-          <b>Worker {{ worker[WorkerProp.WORKER_NUMBER] }}</b>
+          <b>Worker {{ worker[Property.WORKER_NUMBER] }}</b>
         </div>
         <ul class="list-group list-group-flush">
           <template v-for="(value, key) in worker" :key="key">
@@ -79,7 +79,7 @@ const { workersLaunchedCount, workersPlannedCount } = useNode(node, viewOptions)
               </div>
               <div
                 class="col-6"
-                v-html="formatNodeProp(key as string, value)"
+                v-html="formatProp(key as string, value)"
               ></div>
             </li>
           </template>
diff --git a/src/components/tooltip/IoTooltip.vue b/src/components/tooltip/IoTooltip.vue
index e0fde278..5a23a1e4 100644
--- a/src/components/tooltip/IoTooltip.vue
+++ b/src/components/tooltip/IoTooltip.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, reactive } from "vue"
 import type { Node } from "@/interfaces"
-import { NodeProp, Scope } from "@/enums"
+import { Property, Scope } from "@/enums"
 import IoTimingsRow from "@/components/IoTimingsRow.vue"
 
 interface Props {
@@ -22,39 +22,39 @@ const node = reactive<Node>(props.node)
     class="table table-sm"
     v-if="
       node[
-        NodeProp[(exclusivePrefix + 'IO_READ_TIME') as keyof typeof NodeProp]
+        Property[(exclusivePrefix + 'IO_READ_TIME') as keyof typeof Property]
       ] ||
       node[
-        NodeProp[(exclusivePrefix + 'IO_WRITE_TIME') as keyof typeof NodeProp]
+        Property[(exclusivePrefix + 'IO_WRITE_TIME') as keyof typeof Property]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'SHARED_IO_READ_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'SHARED_IO_READ_TIME') as keyof typeof Property
         ]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'SHARED_IO_WRITE_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'SHARED_IO_WRITE_TIME') as keyof typeof Property
         ]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'LOCAL_IO_READ_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'LOCAL_IO_READ_TIME') as keyof typeof Property
         ]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'LOCAL_IO_WRITE_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'LOCAL_IO_WRITE_TIME') as keyof typeof Property
         ]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'TEMP_IO_READ_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'TEMP_IO_READ_TIME') as keyof typeof Property
         ]
       ] ||
       node[
-        NodeProp[
-          (exclusivePrefix + 'TEMP_IO_WRITE_TIME') as keyof typeof NodeProp
+        Property[
+          (exclusivePrefix + 'TEMP_IO_WRITE_TIME') as keyof typeof Property
         ]
       ]
     "
@@ -72,13 +72,13 @@ const node = reactive<Node>(props.node)
         :node="node"
         v-if="
           node[
-            NodeProp[
-              (exclusivePrefix + 'IO_READ_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'IO_READ_TIME') as keyof typeof Property
             ]
           ] ||
           node[
-            NodeProp[
-              (exclusivePrefix + 'IO_WRITE_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'IO_WRITE_TIME') as keyof typeof Property
             ]
           ]
         "
@@ -88,14 +88,14 @@ const node = reactive<Node>(props.node)
         :node="node"
         v-if="
           node[
-            NodeProp[
-              (exclusivePrefix + 'SHARED_IO_READ_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'SHARED_IO_READ_TIME') as keyof typeof Property
             ]
           ] ||
           node[
-            NodeProp[
+            Property[
               (exclusivePrefix +
-                'SHARED_IO_WRITE_TIME') as keyof typeof NodeProp
+                'SHARED_IO_WRITE_TIME') as keyof typeof Property
             ]
           ]
         "
@@ -106,13 +106,13 @@ const node = reactive<Node>(props.node)
         :node="node"
         v-if="
           node[
-            NodeProp[
-              (exclusivePrefix + 'LOCAL_IO_READ_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'LOCAL_IO_READ_TIME') as keyof typeof Property
             ]
           ] ||
           node[
-            NodeProp[
-              (exclusivePrefix + 'LOCAL_IO_WRITE_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'LOCAL_IO_WRITE_TIME') as keyof typeof Property
             ]
           ]
         "
@@ -123,13 +123,13 @@ const node = reactive<Node>(props.node)
         :node="node"
         v-if="
           node[
-            NodeProp[
-              (exclusivePrefix + 'TEMP_IO_READ_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'TEMP_IO_READ_TIME') as keyof typeof Property
             ]
           ] ||
           node[
-            NodeProp[
-              (exclusivePrefix + 'TEMP_IO_WRITE_TIME') as keyof typeof NodeProp
+            Property[
+              (exclusivePrefix + 'TEMP_IO_WRITE_TIME') as keyof typeof Property
             ]
           ]
         "
diff --git a/src/components/tooltip/TimeTooltip.vue b/src/components/tooltip/TimeTooltip.vue
index 7f832d0d..d025330d 100644
--- a/src/components/tooltip/TimeTooltip.vue
+++ b/src/components/tooltip/TimeTooltip.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { Node } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 import { formatDuration } from "@/filters"
 interface Props {
   node: Node
@@ -10,7 +10,7 @@ defineProps<Props>()
 
 <template>
   Duration:
-  <br />Exclusive: {{ formatDuration(node[NodeProp.EXCLUSIVE_DURATION]) }},
+  <br />Exclusive: {{ formatDuration(node[Property.EXCLUSIVE_DURATION]) }},
   Total:
-  {{ formatDuration(node[NodeProp.ACTUAL_TOTAL_TIME]) }}
+  {{ formatDuration(node[Property.ACTUAL_TOTAL_TIME]) }}
 </template>
diff --git a/src/enums.ts b/src/enums.ts
index 104fd16c..0a4875a7 100644
--- a/src/enums.ts
+++ b/src/enums.ts
@@ -44,168 +44,142 @@ export enum CenterMode {
   none,
 }
 
-export enum BuffersProp {
-  SHARED_HIT_BLOCKS = "Shared Hit Blocks",
-  SHARED_READ_BLOCKS = "Shared Read Blocks",
-  SHARED_DIRTIED_BLOCKS = "Shared Dirtied Blocks",
-  SHARED_WRITTEN_BLOCKS = "Shared Written Blocks",
-  TEMP_READ_BLOCKS = "Temp Read Blocks",
-  TEMP_WRITTEN_BLOCKS = "Temp Written Blocks",
-  LOCAL_HIT_BLOCKS = "Local Hit Blocks",
-  LOCAL_READ_BLOCKS = "Local Read Blocks",
-  LOCAL_DIRTIED_BLOCKS = "Local Dirtied Blocks",
-  LOCAL_WRITTEN_BLOCKS = "Local Written Blocks",
-}
-
-export enum NodePropBase {
-  // plan property keys
-  NODE_TYPE = "Node Type",
+export enum Property {
+  ACTUAL_LOOPS = "Actual Loops",
   ACTUAL_ROWS = "Actual Rows",
-  PLAN_ROWS = "Plan Rows",
-  PLAN_WIDTH = "Plan Width",
-  ROWS_REMOVED_BY_FILTER = "Rows Removed by Filter",
-  ROWS_REMOVED_BY_JOIN_FILTER = "Rows Removed by Join Filter",
-  ROWS_REMOVED_BY_INDEX_RECHECK = "Rows Removed by Index Recheck",
+  ACTUAL_ROWS_FRACTIONAL = "*Actual Rows Is Fractional",
+  ACTUAL_ROWS_REVISED = "*Actual Rows Revised",
   ACTUAL_STARTUP_TIME = "Actual Startup Time",
   ACTUAL_TOTAL_TIME = "Actual Total Time",
-  ACTUAL_LOOPS = "Actual Loops",
-  STARTUP_COST = "Startup Cost",
-  TOTAL_COST = "Total Cost",
-  PLANS = "Plans",
-  RELATION_NAME = "Relation Name",
-  SCHEMA = "Schema",
   ALIAS = "Alias",
-  GROUP_KEY = "Group Key",
-  SORT_KEY = "Sort Key",
-  SORT_METHOD = "Sort Method",
-  SORT_SPACE_TYPE = "Sort Space Type",
-  SORT_SPACE_USED = "Sort Space Used",
-  JOIN_TYPE = "Join Type",
-  INDEX_NAME = "Index Name",
-  HASH_CONDITION = "Hash Cond",
-  PARENT_RELATIONSHIP = "Parent Relationship",
-  SUBPLAN_NAME = "Subplan Name",
-  PARALLEL_AWARE = "Parallel Aware",
-  WORKERS = "Workers",
-  WORKERS_PLANNED = "Workers Planned",
-  WORKERS_LAUNCHED = "Workers Launched",
-  READ_BLOCKS = "*Read Blocks",
-  WRITTEN_BLOCKS = "*Written Blocks",
-  IO_READ_TIME = "I/O Read Time",
-  IO_WRITE_TIME = "I/O Write Time",
-  SHARED_IO_READ_TIME = "Shared I/O Read Time",
-  SHARED_IO_WRITE_TIME = "Shared I/O Write Time",
-  LOCAL_IO_READ_TIME = "Local I/O Read Time",
-  LOCAL_IO_WRITE_TIME = "Local I/O Write Time",
-  TEMP_IO_READ_TIME = "Temp I/O Read Time",
-  TEMP_IO_WRITE_TIME = "Temp I/O Write Time",
-  OUTPUT = "Output",
-  HEAP_FETCHES = "Heap Fetches",
-  WAL_RECORDS = "WAL Records",
-  WAL_BYTES = "WAL Bytes",
-  WAL_FPI = "WAL FPI",
-  FULL_SORT_GROUPS = "Full-sort Groups",
-  PRE_SORTED_GROUPS = "Pre-sorted Groups",
-  PRESORTED_KEY = "Presorted Key",
-  FILTER = "Filter",
-  STRATEGY = "Strategy",
-  PARTIAL_MODE = "Partial Mode",
-  OPERATION = "Operation",
-  RECHECK_COND = "Recheck Cond",
-  SCAN_DIRECTION = "Scan Direction",
-  DISABLED = "Disabled",
-
-  // computed by pev
-  NODE_ID = "nodeId",
-  EXCLUSIVE_DURATION = "*Duration (exclusive)",
-  EXCLUSIVE_COST = "*Cost (exclusive)",
-  ACTUAL_ROWS_REVISED = "*Actual Rows Revised",
-  ACTUAL_ROWS_FRACTIONAL = "*Actual Rows Is Fractional",
-  PLAN_ROWS_REVISED = "*Plan Rows Revised",
-  ROWS_REMOVED_BY_FILTER_REVISED = "*Rows Removed by Filter",
-  ROWS_REMOVED_BY_JOIN_FILTER_REVISED = "*Rows Removed by Join Filter",
-  ROWS_REMOVED_BY_INDEX_RECHECK_REVISED = "*Rows Removed by Index Recheck",
-
-  PLANNER_ESTIMATE_FACTOR = "*Planner Row Estimate Factor",
-  PLANNER_ESTIMATE_DIRECTION = "*Planner Row Estimate Direction",
-
-  EXCLUSIVE_SHARED_HIT_BLOCKS = "*Shared Hit Blocks (exclusive)",
-  EXCLUSIVE_SHARED_READ_BLOCKS = "*Shared Read Blocks (exclusive)",
-  EXCLUSIVE_SHARED_DIRTIED_BLOCKS = "*Shared Dirtied Blocks (exclusive)",
-  EXCLUSIVE_SHARED_WRITTEN_BLOCKS = "*Shared Written Blocks (exclusive)",
-  EXCLUSIVE_TEMP_READ_BLOCKS = "*Temp Read Blocks (exclusive)",
-  EXCLUSIVE_TEMP_WRITTEN_BLOCKS = "*Temp Written Blocks (exclusive)",
-  EXCLUSIVE_LOCAL_HIT_BLOCKS = "*Local Hit Blocks (exclusive)",
-  EXCLUSIVE_LOCAL_READ_BLOCKS = "*Local Read Blocks (exclusive)",
-  EXCLUSIVE_LOCAL_DIRTIED_BLOCKS = "*Local Dirtied Blocks (exclusive)",
-  EXCLUSIVE_LOCAL_WRITTEN_BLOCKS = "*Local Written Blocks (exclusive)",
-  EXCLUSIVE_READ_BLOCKS = "*Read Blocks (exclusive)",
-  EXCLUSIVE_WRITTEN_BLOCKS = "*Written Blocks (exclusive)",
-
+  ARRAY_INDEX_KEY = "arrayIndex",
   AVERAGE_IO_READ_SPEED = "*I/O Read Speed",
   AVERAGE_IO_WRITE_SPEED = "*I/O Write Speed",
-  AVERAGE_SHARED_IO_READ_SPEED = "*Shared I/O Read Speed",
-  AVERAGE_SHARED_IO_WRITE_SPEED = "*Shared I/O Write Speed",
   AVERAGE_LOCAL_IO_READ_SPEED = "*Local I/O Read Speed",
   AVERAGE_LOCAL_IO_WRITE_SPEED = "*Local I/O Write Speed",
+  AVERAGE_SHARED_IO_READ_SPEED = "*Shared I/O Read Speed",
+  AVERAGE_SHARED_IO_WRITE_SPEED = "*Shared I/O Write Speed",
+  AVERAGE_SORT_SPACE_USED = "Average Sort Space Used",
+  AVERAGE_SUM_IO_READ_SPEED = "*I/O Read Time speed (all scopes)",
+  AVERAGE_SUM_IO_WRITE_SPEED = "*I/O Write Time speed (all scopes)",
   AVERAGE_TEMP_IO_READ_SPEED = "*Temp I/O Read Speed",
   AVERAGE_TEMP_IO_WRITE_SPEED = "*Temp I/O Write Speed",
-
-  EXCLUSIVE_IO_READ_TIME = "*I/O Read Time (exclusive)",
-  EXCLUSIVE_IO_WRITE_TIME = "*I/O Write Time (exclusive)",
+  CTE_NAME = "CTE Name",
+  CTE_SCAN = "CTE Scan",
+  DISABLED = "Disabled",
   EXCLUSIVE_AVERAGE_IO_READ_SPEED = "*I/O Read Speed (exclusive)",
   EXCLUSIVE_AVERAGE_IO_WRITE_SPEED = "*I/O Write Speed (exclusive)",
-  EXCLUSIVE_SHARED_IO_READ_TIME = "*Shared I/O Read Time (exclusive)",
-  EXCLUSIVE_SHARED_IO_WRITE_TIME = "*Shared I/O Write Time (exclusive)",
-  EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED = "*Shared I/O Read Speed (exclusive)",
-  EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED = "*Shared I/O Write Speed (exclusive)",
-  EXCLUSIVE_LOCAL_IO_READ_TIME = "*Local I/O Read Time (exclusive)",
-  EXCLUSIVE_LOCAL_IO_WRITE_TIME = "*Local I/O Write Time (exclusive)",
   EXCLUSIVE_AVERAGE_LOCAL_IO_READ_SPEED = "*Local I/O Read Speed (exclusive)",
   EXCLUSIVE_AVERAGE_LOCAL_IO_WRITE_SPEED = "*Local I/O Write Speed (exclusive)",
-  EXCLUSIVE_TEMP_IO_READ_TIME = "*Temp I/O Read Time (exclusive)",
-  EXCLUSIVE_TEMP_IO_WRITE_TIME = "*Temp I/O Write Time (exclusive)",
+  EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED = "*Shared I/O Read Speed (exclusive)",
+  EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED = "*Shared I/O Write Speed (exclusive)",
+  EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED = "*I/O Read Time speed (exclusive, all scopes)",
+  EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED = "*I/O Write Time speed (exclusive, all scopes)",
   EXCLUSIVE_AVERAGE_TEMP_IO_READ_SPEED = "*Temp I/O Read Speed (exclusive)",
   EXCLUSIVE_AVERAGE_TEMP_IO_WRITE_SPEED = "*Temp I/O Write Speed (exclusive)",
-  SUM_IO_READ_TIME = "*I/O Read Time (all scopes)",
-  SUM_IO_WRITE_TIME = "*I/O Write Time (all scopes)",
-  AVERAGE_SUM_IO_READ_SPEED = "*I/O Read Time speed (all scopes)",
-  AVERAGE_SUM_IO_WRITE_SPEED = "*I/O Write Time speed (all scopes)",
+  EXCLUSIVE_COST = "*Cost (exclusive)",
+  EXCLUSIVE_DURATION = "*Duration (exclusive)",
+  EXCLUSIVE_IO_READ_TIME = "*I/O Read Time (exclusive)",
+  EXCLUSIVE_IO_WRITE_TIME = "*I/O Write Time (exclusive)",
+  EXCLUSIVE_LOCAL_DIRTIED_BLOCKS = "*Local Dirtied Blocks (exclusive)",
+  EXCLUSIVE_LOCAL_HIT_BLOCKS = "*Local Hit Blocks (exclusive)",
+  EXCLUSIVE_LOCAL_IO_READ_TIME = "*Local I/O Read Time (exclusive)",
+  EXCLUSIVE_LOCAL_IO_WRITE_TIME = "*Local I/O Write Time (exclusive)",
+  EXCLUSIVE_LOCAL_READ_BLOCKS = "*Local Read Blocks (exclusive)",
+  EXCLUSIVE_LOCAL_WRITTEN_BLOCKS = "*Local Written Blocks (exclusive)",
+  EXCLUSIVE_READ_BLOCKS = "*Read Blocks (exclusive)",
+  EXCLUSIVE_SHARED_DIRTIED_BLOCKS = "*Shared Dirtied Blocks (exclusive)",
+  EXCLUSIVE_SHARED_HIT_BLOCKS = "*Shared Hit Blocks (exclusive)",
+  EXCLUSIVE_SHARED_IO_READ_TIME = "*Shared I/O Read Time (exclusive)",
+  EXCLUSIVE_SHARED_IO_WRITE_TIME = "*Shared I/O Write Time (exclusive)",
+  EXCLUSIVE_SHARED_READ_BLOCKS = "*Shared Read Blocks (exclusive)",
+  EXCLUSIVE_SHARED_WRITTEN_BLOCKS = "*Shared Written Blocks (exclusive)",
   EXCLUSIVE_SUM_IO_READ_TIME = "*I/O Read Time (exclusive, all scopes)",
   EXCLUSIVE_SUM_IO_WRITE_TIME = "*I/O Write Time (exclusive, all scopes)",
-  EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED = "*I/O Read Time speed (exclusive, all scopes)",
-  EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED = "*I/O Write Time speed (exclusive, all scopes)",
-
-  WORKERS_PLANNED_BY_GATHER = "*Workers Planned By Gather",
-  WORKERS_LAUNCHED_BY_GATHER = "*Workers Launched By Gather",
-
-  CTE_SCAN = "CTE Scan",
-  CTE_NAME = "CTE Name",
+  EXCLUSIVE_TEMP_IO_READ_TIME = "*Temp I/O Read Time (exclusive)",
+  EXCLUSIVE_TEMP_IO_WRITE_TIME = "*Temp I/O Write Time (exclusive)",
+  EXCLUSIVE_TEMP_READ_BLOCKS = "*Temp Read Blocks (exclusive)",
+  EXCLUSIVE_TEMP_WRITTEN_BLOCKS = "*Temp Written Blocks (exclusive)",
+  EXCLUSIVE_WRITTEN_BLOCKS = "*Written Blocks (exclusive)",
+  FILTER = "Filter",
+  FULL_SORT_GROUPS = "Full-sort Groups",
   FUNCTION_NAME = "Function Name",
-
-  ARRAY_INDEX_KEY = "arrayIndex",
-
-  PEV_PLAN_TAG = "plan_",
+  GROUP_COUNT = "Group Count",
+  GROUP_KEY = "Group Key",
+  HASH_CONDITION = "Hash Cond",
+  HEAP_FETCHES = "Heap Fetches",
+  INDEX_NAME = "Index Name",
+  IO_READ_TIME = "I/O Read Time",
+  IO_WRITE_TIME = "I/O Write Time",
   JIT = "JIT",
+  JOIN_TYPE = "Join Type",
+  LOCAL_DIRTIED_BLOCKS = "Local Dirtied Blocks",
+  LOCAL_HIT_BLOCKS = "Local Hit Blocks",
+  LOCAL_IO_READ_TIME = "Local I/O Read Time",
+  LOCAL_IO_WRITE_TIME = "Local I/O Write Time",
+  LOCAL_READ_BLOCKS = "Local Read Blocks",
+  LOCAL_WRITTEN_BLOCKS = "Local Written Blocks",
+  NODE_ID = "nodeId",
+  NODE_TYPE = "Node Type",
+  OPERATION = "Operation",
+  OUTPUT = "Output",
+  PARALLEL_AWARE = "Parallel Aware",
+  PARENT_RELATIONSHIP = "Parent Relationship",
+  PARTIAL_MODE = "Partial Mode",
+  PEAK_SORT_SPACE_USED = "Peak Sort Space Used",
+  PEV_PLAN_TAG = "plan_",
+  PLANNER_ESTIMATE_DIRECTION = "*Planner Row Estimate Direction",
+  PLANNER_ESTIMATE_FACTOR = "*Planner Row Estimate Factor",
+  PLANS = "Plans",
+  PLAN_ROWS = "Plan Rows",
+  PLAN_ROWS_REVISED = "*Plan Rows Revised",
+  PLAN_WIDTH = "Plan Width",
+  PRESORTED_KEY = "Presorted Key",
+  PRE_SORTED_GROUPS = "Pre-sorted Groups",
+  READ_BLOCKS = "*Read Blocks",
+  RECHECK_COND = "Recheck Cond",
+  RELATION_NAME = "Relation Name",
+  ROWS_REMOVED_BY_FILTER = "Rows Removed by Filter",
+  ROWS_REMOVED_BY_FILTER_REVISED = "*Rows Removed by Filter",
+  ROWS_REMOVED_BY_INDEX_RECHECK = "Rows Removed by Index Recheck",
+  ROWS_REMOVED_BY_INDEX_RECHECK_REVISED = "*Rows Removed by Index Recheck",
+  ROWS_REMOVED_BY_JOIN_FILTER = "Rows Removed by Join Filter",
+  ROWS_REMOVED_BY_JOIN_FILTER_REVISED = "*Rows Removed by Join Filter",
+  SCAN_DIRECTION = "Scan Direction",
+  SCHEMA = "Schema",
   SERIALIZATION = "Serialization",
-}
-
-export const NodeProp = {
-  ...NodePropBase,
-  ...BuffersProp,
-} as const;
-
-export type NodeProp = typeof NodeProp[keyof typeof NodeProp]
-
-export enum WorkerProp {
-  // plan property keys
-  WORKER_NUMBER = "Worker Number",
-}
-
-export enum SortGroupsProp {
-  GROUP_COUNT = "Group Count",
+  SHARED_DIRTIED_BLOCKS = "Shared Dirtied Blocks",
+  SHARED_HIT_BLOCKS = "Shared Hit Blocks",
+  SHARED_IO_READ_TIME = "Shared I/O Read Time",
+  SHARED_IO_WRITE_TIME = "Shared I/O Write Time",
+  SHARED_READ_BLOCKS = "Shared Read Blocks",
+  SHARED_WRITTEN_BLOCKS = "Shared Written Blocks",
+  SORT_KEY = "Sort Key",
+  SORT_METHOD = "Sort Method",
   SORT_METHODS_USED = "Sort Methods Used",
   SORT_SPACE_MEMORY = "Sort Space Memory",
+  SORT_SPACE_TYPE = "Sort Space Type",
+  SORT_SPACE_USED = "Sort Space Used",
+  STARTUP_COST = "Startup Cost",
+  STRATEGY = "Strategy",
+  SUBPLAN_NAME = "Subplan Name",
+  SUM_IO_READ_TIME = "*I/O Read Time (all scopes)",
+  SUM_IO_WRITE_TIME = "*I/O Write Time (all scopes)",
+  TEMP_IO_READ_TIME = "Temp I/O Read Time",
+  TEMP_IO_WRITE_TIME = "Temp I/O Write Time",
+  TEMP_READ_BLOCKS = "Temp Read Blocks",
+  TEMP_WRITTEN_BLOCKS = "Temp Written Blocks",
+  TOTAL_COST = "Total Cost",
+  WAL_BYTES = "WAL Bytes",
+  WAL_FPI = "WAL FPI",
+  WAL_RECORDS = "WAL Records",
+  WORKERS = "Workers",
+  WORKERS_LAUNCHED = "Workers Launched",
+  WORKERS_LAUNCHED_BY_GATHER = "*Workers Launched By Gather",
+  WORKERS_PLANNED = "Workers Planned",
+  WORKERS_PLANNED_BY_GATHER = "*Workers Planned By Gather",
+  WORKER_NUMBER = "Worker Number",
+  WRITTEN_BLOCKS = "*Written Blocks",
 }
 
 export enum SortSpaceMemoryProp {
diff --git a/src/filters.ts b/src/filters.ts
index ecdcb9ca..32a57365 100644
--- a/src/filters.ts
+++ b/src/filters.ts
@@ -1,6 +1,6 @@
 import _ from "lodash"
 import { createApp } from "vue"
-import { EstimateDirection, NodeProp } from "@/enums"
+import { EstimateDirection, Property } from "@/enums"
 import SortGroup from "@/components/SortGroup.vue"
 import JitDetails from "@/components/JitDetails.vue"
 import hljs from "highlight.js/lib/core"
@@ -198,111 +198,101 @@ function formatEstimateDirection(value: unknown): string {
 
 type Formatter = (value: unknown) => string;
 
-const nodePropFormatters: Partial<Record<NodeProp, Formatter>> = {
-  [NodeProp.ACTUAL_ROWS]: formatRows,
-  [NodeProp.ACTUAL_LOOPS]: formatLoops,
-  [NodeProp.PLAN_ROWS]: formatRows,
-  [NodeProp.PLAN_WIDTH]: formatBytes,
-  [NodeProp.ACTUAL_ROWS_REVISED]: formatRows,
-  [NodeProp.ACTUAL_ROWS_FRACTIONAL]: formatBoolean,
-  [NodeProp.PLAN_ROWS_REVISED]: formatRows,
-  [NodeProp.ACTUAL_TOTAL_TIME]: formatDuration,
-  [NodeProp.ACTUAL_STARTUP_TIME]: formatDuration,
-  [NodeProp.STARTUP_COST]: formatCost,
-  [NodeProp.TOTAL_COST]: formatCost,
-  [NodeProp.PARALLEL_AWARE]: formatBoolean,
-  [NodeProp.WORKERS]: formatJson,
-  [NodeProp.SORT_SPACE_USED]: formatKilobytes,
-  [NodeProp.ROWS_REMOVED_BY_FILTER]: formatRows,
-  [NodeProp.ROWS_REMOVED_BY_JOIN_FILTER]: formatRows,
-  [NodeProp.ROWS_REMOVED_BY_FILTER_REVISED]: formatRows,
-  [NodeProp.ROWS_REMOVED_BY_JOIN_FILTER_REVISED]: formatRows,
-  [NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK]: formatRows,
-  [NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED]: formatRows,
-  [NodeProp.HEAP_FETCHES]: formatRows,
-  [NodeProp.OUTPUT]: formatList,
-  [NodeProp.SORT_KEY]: formatList,
-  [NodeProp.PRESORTED_KEY]: formatList,
-  [NodeProp.WAL_RECORDS]: formatRows,
-  [NodeProp.WAL_BYTES]: formatBytes,
-  [NodeProp.WAL_FPI]: formatRows,
-
-  [NodeProp.EXCLUSIVE_DURATION]: formatDuration,
-  [NodeProp.EXCLUSIVE_COST]: formatCost,
-
-  [NodeProp.PLANNER_ESTIMATE_FACTOR]: formatFactor,
-  [NodeProp.PLANNER_ESTIMATE_DIRECTION]: formatEstimateDirection,
-
-  [NodeProp.IO_READ_TIME]: formatDuration,
-  [NodeProp.IO_WRITE_TIME]: formatDuration,
-  [NodeProp.SUM_IO_READ_TIME]: formatDuration,
-  [NodeProp.SUM_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.AVERAGE_SUM_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.AVERAGE_SUM_IO_WRITE_SPEED]: formatTransferRate,
-
-  [NodeProp.AVERAGE_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.AVERAGE_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.SHARED_IO_READ_TIME]: formatDuration,
-  [NodeProp.SHARED_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.AVERAGE_SHARED_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.AVERAGE_SHARED_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.LOCAL_IO_READ_TIME]: formatDuration,
-  [NodeProp.LOCAL_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.AVERAGE_LOCAL_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.AVERAGE_LOCAL_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.TEMP_IO_READ_TIME]: formatDuration,
-  [NodeProp.TEMP_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.AVERAGE_TEMP_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.AVERAGE_TEMP_IO_WRITE_SPEED]: formatTransferRate,
-
-  [NodeProp.EXCLUSIVE_IO_READ_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_AVERAGE_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_SHARED_IO_READ_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_SHARED_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_LOCAL_IO_READ_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_LOCAL_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_AVERAGE_LOCAL_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_AVERAGE_LOCAL_IO_WRITE_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_TEMP_IO_READ_TIME]: formatDuration,
-
-  [NodeProp.EXCLUSIVE_TEMP_IO_WRITE_TIME]: formatDuration,
-  [NodeProp.EXCLUSIVE_AVERAGE_TEMP_IO_READ_SPEED]: formatTransferRate,
-  [NodeProp.EXCLUSIVE_AVERAGE_TEMP_IO_WRITE_SPEED]: formatTransferRate,
-
-  [NodeProp.SHARED_HIT_BLOCKS]: formatBlocksHtml,
-  [NodeProp.SHARED_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.SHARED_DIRTIED_BLOCKS]: formatBlocksHtml,
-  [NodeProp.SHARED_WRITTEN_BLOCKS]: formatBlocksHtml,
-  [NodeProp.TEMP_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.TEMP_WRITTEN_BLOCKS]: formatBlocksHtml,
-  [NodeProp.LOCAL_HIT_BLOCKS]: formatBlocksHtml,
-  [NodeProp.LOCAL_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.LOCAL_DIRTIED_BLOCKS]: formatBlocksHtml,
-  [NodeProp.LOCAL_WRITTEN_BLOCKS]: formatBlocksHtml,
-
-  [NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]: formatBlocksHtml,
-  [NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]: formatBlocksHtml,
-
-  [NodeProp.FULL_SORT_GROUPS]: formatSortGroups,
-  [NodeProp.PRE_SORTED_GROUPS]: formatSortGroups,
-
-  [NodeProp.JIT]: formatJit,
+const nodePropFormatters: Partial<Record<Property, Formatter>> = {
+  [Property.ACTUAL_LOOPS]: formatLoops,
+  [Property.ACTUAL_ROWS]: formatRows,
+  [Property.ACTUAL_ROWS_FRACTIONAL]: formatBoolean,
+  [Property.ACTUAL_ROWS_REVISED]: formatRows,
+  [Property.ACTUAL_STARTUP_TIME]: formatDuration,
+  [Property.ACTUAL_TOTAL_TIME]: formatDuration,
+  [Property.AVERAGE_IO_READ_SPEED]: formatTransferRate,
+  [Property.AVERAGE_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.AVERAGE_LOCAL_IO_READ_SPEED]: formatTransferRate,
+  [Property.AVERAGE_LOCAL_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.AVERAGE_SHARED_IO_READ_SPEED]: formatTransferRate,
+  [Property.AVERAGE_SHARED_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.AVERAGE_SUM_IO_READ_SPEED]: formatTransferRate,
+  [Property.AVERAGE_SUM_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.AVERAGE_TEMP_IO_READ_SPEED]: formatTransferRate,
+  [Property.AVERAGE_TEMP_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_IO_READ_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_LOCAL_IO_READ_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_LOCAL_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_TEMP_IO_READ_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_AVERAGE_TEMP_IO_WRITE_SPEED]: formatTransferRate,
+  [Property.EXCLUSIVE_COST]: formatCost,
+  [Property.EXCLUSIVE_DURATION]: formatDuration,
+  [Property.EXCLUSIVE_IO_READ_TIME]: formatDuration,
+  [Property.EXCLUSIVE_IO_WRITE_TIME]: formatDuration,
+  [Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_LOCAL_IO_READ_TIME]: formatDuration,
+  [Property.EXCLUSIVE_LOCAL_IO_WRITE_TIME]: formatDuration,
+  [Property.EXCLUSIVE_LOCAL_READ_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_SHARED_HIT_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_SHARED_IO_READ_TIME]: formatDuration,
+  [Property.EXCLUSIVE_SHARED_IO_WRITE_TIME]: formatDuration,
+  [Property.EXCLUSIVE_SHARED_READ_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_TEMP_IO_READ_TIME]: formatDuration,
+  [Property.EXCLUSIVE_TEMP_IO_WRITE_TIME]: formatDuration,
+  [Property.EXCLUSIVE_TEMP_READ_BLOCKS]: formatBlocksHtml,
+  [Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.FULL_SORT_GROUPS]: formatSortGroups,
+  [Property.HEAP_FETCHES]: formatRows,
+  [Property.IO_READ_TIME]: formatDuration,
+  [Property.IO_WRITE_TIME]: formatDuration,
+  [Property.JIT]: formatJit,
+  [Property.LOCAL_DIRTIED_BLOCKS]: formatBlocksHtml,
+  [Property.LOCAL_HIT_BLOCKS]: formatBlocksHtml,
+  [Property.LOCAL_IO_READ_TIME]: formatDuration,
+  [Property.LOCAL_IO_WRITE_TIME]: formatDuration,
+  [Property.LOCAL_READ_BLOCKS]: formatBlocksHtml,
+  [Property.LOCAL_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.OUTPUT]: formatList,
+  [Property.PARALLEL_AWARE]: formatBoolean,
+  [Property.PLANNER_ESTIMATE_DIRECTION]: formatEstimateDirection,
+  [Property.PLANNER_ESTIMATE_FACTOR]: formatFactor,
+  [Property.PLAN_ROWS]: formatRows,
+  [Property.PLAN_ROWS_REVISED]: formatRows,
+  [Property.PLAN_WIDTH]: formatBytes,
+  [Property.PRESORTED_KEY]: formatList,
+  [Property.PRE_SORTED_GROUPS]: formatSortGroups,
+  [Property.ROWS_REMOVED_BY_FILTER]: formatRows,
+  [Property.ROWS_REMOVED_BY_FILTER_REVISED]: formatRows,
+  [Property.ROWS_REMOVED_BY_INDEX_RECHECK]: formatRows,
+  [Property.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED]: formatRows,
+  [Property.ROWS_REMOVED_BY_JOIN_FILTER]: formatRows,
+  [Property.ROWS_REMOVED_BY_JOIN_FILTER_REVISED]: formatRows,
+  [Property.SHARED_DIRTIED_BLOCKS]: formatBlocksHtml,
+  [Property.SHARED_HIT_BLOCKS]: formatBlocksHtml,
+  [Property.SHARED_IO_READ_TIME]: formatDuration,
+  [Property.SHARED_IO_WRITE_TIME]: formatDuration,
+  [Property.SHARED_READ_BLOCKS]: formatBlocksHtml,
+  [Property.SHARED_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.SORT_KEY]: formatList,
+  [Property.SORT_SPACE_USED]: formatKilobytes,
+  [Property.STARTUP_COST]: formatCost,
+  [Property.SUM_IO_READ_TIME]: formatDuration,
+  [Property.SUM_IO_WRITE_TIME]: formatDuration,
+  [Property.TEMP_IO_READ_TIME]: formatDuration,
+  [Property.TEMP_IO_WRITE_TIME]: formatDuration,
+  [Property.TEMP_READ_BLOCKS]: formatBlocksHtml,
+  [Property.TEMP_WRITTEN_BLOCKS]: formatBlocksHtml,
+  [Property.TOTAL_COST]: formatCost,
+  [Property.WAL_BYTES]: formatBytes,
+  [Property.WAL_FPI]: formatRows,
+  [Property.WAL_RECORDS]: formatRows,
+  [Property.WORKERS]: formatJson,
 }
 
-export function formatNodeProp(key: string, value: unknown): string {
-  const formatter = nodePropFormatters[key as NodeProp];
+export function formatProp(key: string, value: unknown): string {
+  const formatter = nodePropFormatters[key as Property];
   if (formatter) return formatter(value);
   return _.escape(value as unknown as string)
 }
diff --git a/src/interfaces.ts b/src/interfaces.ts
index ce74175f..a94ebb2f 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -1,14 +1,11 @@
 import type {
   BufferLocation,
-  BuffersProp,
   EstimateDirection,
   HighlightType,
-  SortGroupsProp,
   SortSpaceMemoryProp,
-  WorkerProp,
 } from "@/enums"
 
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 
 export interface IPlan {
   id: string
@@ -80,76 +77,76 @@ export class Node {
   ["Options"]?: Options;
   ["Timing"]?: Timing;
   ["Settings"]?: Settings;
-  [NodeProp.ACTUAL_LOOPS]!: number;
-  [NodeProp.ACTUAL_ROWS]!: number;
-  [NodeProp.ACTUAL_ROWS_REVISED]!: number;
-  [NodeProp.ACTUAL_STARTUP_TIME]?: number;
-  [NodeProp.ACTUAL_TOTAL_TIME]?: number;
-  [NodeProp.EXCLUSIVE_COST]!: number;
-  [NodeProp.EXCLUSIVE_DURATION]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_READ_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_WRITTEN_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]!: number;
-  [NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]!: number;
-  [NodeProp.FILTER]!: string;
-  [NodeProp.PLANNER_ESTIMATE_DIRECTION]?: EstimateDirection;
-  [NodeProp.PLANNER_ESTIMATE_FACTOR]?: number;
-  [NodeProp.INDEX_NAME]?: string;
-  [NodeProp.NODE_TYPE]!: string;
-  [NodeProp.PARALLEL_AWARE]: boolean = false;
-  [NodeProp.PLANS]!: Node[];
-  [NodeProp.PLAN_ROWS]!: number;
-  [NodeProp.PLAN_ROWS_REVISED]?: number;
-  [NodeProp.SUBPLAN_NAME]?: string;
-  [NodeProp.TOTAL_COST]!: number;
-  [NodeProp.WORKERS]?: Worker[];
-  [NodeProp.WORKERS_LAUNCHED]?: number;
-  [NodeProp.WORKERS_PLANNED]?: number;
-  [NodeProp.WORKERS_LAUNCHED_BY_GATHER]?: number;
-  [NodeProp.WORKERS_PLANNED_BY_GATHER]?: number;
-  [NodeProp.EXCLUSIVE_IO_READ_TIME]!: number;
-  [NodeProp.EXCLUSIVE_IO_WRITE_TIME]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_IO_READ_TIME]!: number;
-  [NodeProp.EXCLUSIVE_SHARED_IO_WRITE_TIME]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_IO_READ_TIME]!: number;
-  [NodeProp.EXCLUSIVE_LOCAL_IO_WRITE_TIME]!: number;
-  [NodeProp.EXCLUSIVE_TEMP_IO_READ_TIME]!: number;
-  [NodeProp.EXCLUSIVE_TEMP_IO_WRITE_TIME]!: number;
-  [NodeProp.EXCLUSIVE_SUM_IO_READ_TIME]!: number;
-  [NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME]!: number;
-  [NodeProp.AVERAGE_IO_READ_SPEED]!: number;
-  [NodeProp.AVERAGE_IO_WRITE_SPEED]!: number;
-  [NodeProp.AVERAGE_SHARED_IO_READ_SPEED]!: number;
-  [NodeProp.AVERAGE_SHARED_IO_WRITE_SPEED]!: number;
-  [NodeProp.AVERAGE_LOCAL_IO_READ_SPEED]!: number;
-  [NodeProp.AVERAGE_LOCAL_IO_WRITE_SPEED]!: number;
-  [NodeProp.AVERAGE_TEMP_IO_READ_SPEED]!: number;
-  [NodeProp.AVERAGE_TEMP_IO_WRITE_SPEED]!: number;
-  [NodeProp.AVERAGE_SUM_IO_READ_SPEED]!: number;
-  [NodeProp.AVERAGE_SUM_IO_WRITE_SPEED]!: number;
-  [NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED]!: number;
-  [NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED]!: number;
-  [NodeProp.IO_READ_TIME]!: number;
-  [NodeProp.IO_WRITE_TIME]!: number;
-  [NodeProp.SHARED_IO_READ_TIME]!: number;
-  [NodeProp.SHARED_IO_WRITE_TIME]!: number;
-  [NodeProp.LOCAL_IO_READ_TIME]!: number;
-  [NodeProp.LOCAL_IO_WRITE_TIME]!: number;
-  [NodeProp.TEMP_IO_READ_TIME]!: number;
-  [NodeProp.TEMP_IO_WRITE_TIME]!: number;
-  [NodeProp.SUM_IO_READ_TIME]!: number;
-  [NodeProp.SUM_IO_WRITE_TIME]!: number;
-  [NodeProp.PARTIAL_MODE]!: string;
-  [NodeProp.SCAN_DIRECTION]!: string;
-  [NodeProp.DISABLED]: boolean = false;
+  [Property.ACTUAL_LOOPS]!: number;
+  [Property.ACTUAL_ROWS]!: number;
+  [Property.ACTUAL_ROWS_REVISED]!: number;
+  [Property.ACTUAL_STARTUP_TIME]?: number;
+  [Property.ACTUAL_TOTAL_TIME]?: number;
+  [Property.EXCLUSIVE_COST]!: number;
+  [Property.EXCLUSIVE_DURATION]!: number;
+  [Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]!: number;
+  [Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]!: number;
+  [Property.EXCLUSIVE_LOCAL_READ_BLOCKS]!: number;
+  [Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]!: number;
+  [Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]!: number;
+  [Property.EXCLUSIVE_SHARED_HIT_BLOCKS]!: number;
+  [Property.EXCLUSIVE_SHARED_READ_BLOCKS]!: number;
+  [Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]!: number;
+  [Property.EXCLUSIVE_READ_BLOCKS]!: number;
+  [Property.EXCLUSIVE_WRITTEN_BLOCKS]!: number;
+  [Property.EXCLUSIVE_TEMP_READ_BLOCKS]!: number;
+  [Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]!: number;
+  [Property.FILTER]!: string;
+  [Property.PLANNER_ESTIMATE_DIRECTION]?: EstimateDirection;
+  [Property.PLANNER_ESTIMATE_FACTOR]?: number;
+  [Property.INDEX_NAME]?: string;
+  [Property.NODE_TYPE]!: string;
+  [Property.PARALLEL_AWARE]: boolean = false;
+  [Property.PLANS]!: Node[];
+  [Property.PLAN_ROWS]!: number;
+  [Property.PLAN_ROWS_REVISED]?: number;
+  [Property.SUBPLAN_NAME]?: string;
+  [Property.TOTAL_COST]!: number;
+  [Property.WORKERS]?: Worker[];
+  [Property.WORKERS_LAUNCHED]?: number;
+  [Property.WORKERS_PLANNED]?: number;
+  [Property.WORKERS_LAUNCHED_BY_GATHER]?: number;
+  [Property.WORKERS_PLANNED_BY_GATHER]?: number;
+  [Property.EXCLUSIVE_IO_READ_TIME]!: number;
+  [Property.EXCLUSIVE_IO_WRITE_TIME]!: number;
+  [Property.EXCLUSIVE_SHARED_IO_READ_TIME]!: number;
+  [Property.EXCLUSIVE_SHARED_IO_WRITE_TIME]!: number;
+  [Property.EXCLUSIVE_LOCAL_IO_READ_TIME]!: number;
+  [Property.EXCLUSIVE_LOCAL_IO_WRITE_TIME]!: number;
+  [Property.EXCLUSIVE_TEMP_IO_READ_TIME]!: number;
+  [Property.EXCLUSIVE_TEMP_IO_WRITE_TIME]!: number;
+  [Property.EXCLUSIVE_SUM_IO_READ_TIME]!: number;
+  [Property.EXCLUSIVE_SUM_IO_WRITE_TIME]!: number;
+  [Property.AVERAGE_IO_READ_SPEED]!: number;
+  [Property.AVERAGE_IO_WRITE_SPEED]!: number;
+  [Property.AVERAGE_SHARED_IO_READ_SPEED]!: number;
+  [Property.AVERAGE_SHARED_IO_WRITE_SPEED]!: number;
+  [Property.AVERAGE_LOCAL_IO_READ_SPEED]!: number;
+  [Property.AVERAGE_LOCAL_IO_WRITE_SPEED]!: number;
+  [Property.AVERAGE_TEMP_IO_READ_SPEED]!: number;
+  [Property.AVERAGE_TEMP_IO_WRITE_SPEED]!: number;
+  [Property.AVERAGE_SUM_IO_READ_SPEED]!: number;
+  [Property.AVERAGE_SUM_IO_WRITE_SPEED]!: number;
+  [Property.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED]!: number;
+  [Property.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED]!: number;
+  [Property.IO_READ_TIME]!: number;
+  [Property.IO_WRITE_TIME]!: number;
+  [Property.SHARED_IO_READ_TIME]!: number;
+  [Property.SHARED_IO_WRITE_TIME]!: number;
+  [Property.LOCAL_IO_READ_TIME]!: number;
+  [Property.LOCAL_IO_WRITE_TIME]!: number;
+  [Property.TEMP_IO_READ_TIME]!: number;
+  [Property.TEMP_IO_WRITE_TIME]!: number;
+  [Property.SUM_IO_READ_TIME]!: number;
+  [Property.SUM_IO_WRITE_TIME]!: number;
+  [Property.PARTIAL_MODE]!: string;
+  [Property.SCAN_DIRECTION]!: string;
+  [Property.DISABLED]: boolean = false;
   [k: string]:
     | Node[]
     | Options
@@ -166,7 +163,7 @@ export class Node {
     if (!type) {
       return
     }
-    this[NodeProp.NODE_TYPE] = type
+    this[Property.NODE_TYPE] = type
 
     enum ScanAndOperationMatch {
       NodeType = 1,
@@ -218,77 +215,77 @@ export class Node {
     }
     const subqueryRegex = /^(Subquery\sScan)\son\s(.+)$/.exec(type)
     if (scanAndOperationsRegex) {
-      this[NodeProp.NODE_TYPE] =
+      this[Property.NODE_TYPE] =
         scanAndOperationsRegex[ScanAndOperationMatch.NodeType]
-      this[NodeProp.RELATION_NAME] =
+      this[Property.RELATION_NAME] =
         scanAndOperationsRegex[ScanAndOperationMatch.RelationName]
       if (scanAndOperationsRegex[ScanAndOperationMatch.Alias]) {
-        this[NodeProp.ALIAS] =
+        this[Property.ALIAS] =
           scanAndOperationsRegex[ScanAndOperationMatch.Alias]
       }
     } else if (bitmapRegex) {
-      this[NodeProp.NODE_TYPE] = bitmapRegex[BitmapMatch.NodeType]
-      this[NodeProp.INDEX_NAME] = bitmapRegex[BitmapMatch.IndexName]
+      this[Property.NODE_TYPE] = bitmapRegex[BitmapMatch.NodeType]
+      this[Property.INDEX_NAME] = bitmapRegex[BitmapMatch.IndexName]
     } else if (indexRegex) {
-      this[NodeProp.NODE_TYPE] = indexRegex[IndexMatch.NodeType]
-      this[NodeProp.INDEX_NAME] = indexRegex[IndexMatch.IndexName]
-      this[NodeProp.SCAN_DIRECTION] = indexRegex[IndexMatch.ScanDirection] ? "Backward" : "Forward"
-      this[NodeProp.RELATION_NAME] = indexRegex[IndexMatch.RelationName]
+      this[Property.NODE_TYPE] = indexRegex[IndexMatch.NodeType]
+      this[Property.INDEX_NAME] = indexRegex[IndexMatch.IndexName]
+      this[Property.SCAN_DIRECTION] = indexRegex[IndexMatch.ScanDirection] ? "Backward" : "Forward"
+      this[Property.RELATION_NAME] = indexRegex[IndexMatch.RelationName]
       if (indexRegex[IndexMatch.Alias]) {
-        this[NodeProp.ALIAS] = indexRegex[IndexMatch.Alias]
+        this[Property.ALIAS] = indexRegex[IndexMatch.Alias]
       }
     } else if (cteRegex) {
-      this[NodeProp.NODE_TYPE] = cteRegex[CteMatch.NodeType]
-      this[NodeProp.CTE_NAME] = cteRegex[CteMatch.CteName]
+      this[Property.NODE_TYPE] = cteRegex[CteMatch.NodeType]
+      this[Property.CTE_NAME] = cteRegex[CteMatch.CteName]
       if (cteRegex[CteMatch.Alias]) {
-        this[NodeProp.ALIAS] = cteRegex[CteMatch.Alias]
+        this[Property.ALIAS] = cteRegex[CteMatch.Alias]
       }
     } else if (functionRegex) {
-      this[NodeProp.NODE_TYPE] = functionRegex[FunctionMatch.NodeType]
-      this[NodeProp.FUNCTION_NAME] = functionRegex[FunctionMatch.FunctionName]
+      this[Property.NODE_TYPE] = functionRegex[FunctionMatch.NodeType]
+      this[Property.FUNCTION_NAME] = functionRegex[FunctionMatch.FunctionName]
       if (functionRegex[FunctionMatch.Alias]) {
-        this[NodeProp.ALIAS] = functionRegex[FunctionMatch.Alias]
+        this[Property.ALIAS] = functionRegex[FunctionMatch.Alias]
       }
     } else if (subqueryRegex) {
-      this[NodeProp.NODE_TYPE] = subqueryRegex[SubqueryMatch.NodeType]
-      this[NodeProp.ALIAS] = subqueryRegex[SubqueryMatch.Alias]
+      this[Property.NODE_TYPE] = subqueryRegex[SubqueryMatch.NodeType]
+      this[Property.ALIAS] = subqueryRegex[SubqueryMatch.Alias]
     }
     enum ParallelMatch {
       NodeType = 2,
     }
     const parallelRegex = /^(Parallel\s+)(.*)/.exec(
-      <string>this[NodeProp.NODE_TYPE],
+      <string>this[Property.NODE_TYPE],
     )
     if (parallelRegex) {
-      this[NodeProp.NODE_TYPE] = parallelRegex[ParallelMatch.NodeType]
-      this[NodeProp.PARALLEL_AWARE] = true
+      this[Property.NODE_TYPE] = parallelRegex[ParallelMatch.NodeType]
+      this[Property.PARALLEL_AWARE] = true
     }
 
     enum JoinMatch {
       NodeType = 1,
     }
-    const joinRegex = /(.*)\sJoin$/.exec(<string>this[NodeProp.NODE_TYPE])
+    const joinRegex = /(.*)\sJoin$/.exec(<string>this[Property.NODE_TYPE])
 
     enum JoinModifierMatch {
       NodeType = 1,
       JoinType,
     }
     const joinModifierRegex = /(.*)\s+(Full|Left|Right|Anti)/.exec(
-      <string>this[NodeProp.NODE_TYPE],
+      <string>this[Property.NODE_TYPE],
     )
     if (joinRegex) {
-      this[NodeProp.NODE_TYPE] = joinRegex[JoinMatch.NodeType]
+      this[Property.NODE_TYPE] = joinRegex[JoinMatch.NodeType]
       if (joinModifierRegex) {
-        this[NodeProp.NODE_TYPE] = joinModifierRegex[JoinModifierMatch.NodeType]
-        this[NodeProp.JOIN_TYPE] = joinModifierRegex[JoinModifierMatch.JoinType]
+        this[Property.NODE_TYPE] = joinModifierRegex[JoinModifierMatch.NodeType]
+        this[Property.JOIN_TYPE] = joinModifierRegex[JoinModifierMatch.JoinType]
       }
-      this[NodeProp.NODE_TYPE] += " Join"
+      this[Property.NODE_TYPE] += " Join"
     }
   }
 }
 
 export interface Worker {
-  [WorkerProp.WORKER_NUMBER]: number
+  [Property.WORKER_NUMBER]: number
   [k: string]: string | number | object
 }
 
@@ -305,8 +302,8 @@ export type Settings = {
 }
 
 export type SortGroups = {
-  [SortGroupsProp.SORT_METHODS_USED]: string[]
-  [SortGroupsProp.SORT_SPACE_MEMORY]: SortSpaceMemory
+  [Property.SORT_METHODS_USED]: string[]
+  [Property.SORT_SPACE_MEMORY]: SortSpaceMemory
   [key: string]: number | string | string[] | SortSpaceMemory
 }
 
@@ -337,16 +334,16 @@ export interface JIT {
 export interface ISerialization {
   Time: number
   "Output Volume": number
-  [BuffersProp.LOCAL_DIRTIED_BLOCKS]: number
-  [BuffersProp.LOCAL_HIT_BLOCKS]: number
-  [BuffersProp.LOCAL_READ_BLOCKS]: number
-  [BuffersProp.LOCAL_WRITTEN_BLOCKS]: number
-  [BuffersProp.SHARED_DIRTIED_BLOCKS]: number
-  [BuffersProp.SHARED_HIT_BLOCKS]: number
-  [BuffersProp.SHARED_READ_BLOCKS]: number
-  [BuffersProp.SHARED_WRITTEN_BLOCKS]: number
-  [BuffersProp.TEMP_READ_BLOCKS]: number
-  [BuffersProp.TEMP_WRITTEN_BLOCKS]: number
+  [Property.LOCAL_DIRTIED_BLOCKS]: number
+  [Property.LOCAL_HIT_BLOCKS]: number
+  [Property.LOCAL_READ_BLOCKS]: number
+  [Property.LOCAL_WRITTEN_BLOCKS]: number
+  [Property.SHARED_DIRTIED_BLOCKS]: number
+  [Property.SHARED_HIT_BLOCKS]: number
+  [Property.SHARED_READ_BLOCKS]: number
+  [Property.SHARED_WRITTEN_BLOCKS]: number
+  [Property.TEMP_READ_BLOCKS]: number
+  [Property.TEMP_WRITTEN_BLOCKS]: number
 }
 
 // A plan node with id, node, isLastSibling, branches
diff --git a/src/node.ts b/src/node.ts
index 0cfbc94e..74fb130f 100644
--- a/src/node.ts
+++ b/src/node.ts
@@ -4,11 +4,11 @@ import { computed, onBeforeMount, ref, watch } from "vue"
 import type { Node, Worker, ViewOptions } from "@/interfaces"
 import {
   BufferLocation,
-  NodeProp,
+  Property,
   EstimateDirection,
   HighlightType,
 } from "@/enums"
-import { formatBlocks, formatCost, formatDuration, formatFactor, formatNodeProp, formatRows } from "@/filters"
+import { formatBlocks, formatCost, formatDuration, formatFactor, formatProp, formatRows } from "@/filters"
 import { numberToColorHsl } from "@/services/color-service"
 import { store } from "@/store"
 
@@ -34,8 +34,8 @@ export default function useNode(
     calculateCost()
     calculateRowsRemoved()
     plannerRowEstimateDirection.value =
-      node[NodeProp.PLANNER_ESTIMATE_DIRECTION]
-    plannerRowEstimateValue.value = node[NodeProp.PLANNER_ESTIMATE_FACTOR]
+      node[Property.PLANNER_ESTIMATE_DIRECTION]
+    plannerRowEstimateValue.value = node[Property.PLANNER_ESTIMATE_FACTOR]
   })
 
   watch(() => viewOptions.highlightType, calculateBar)
@@ -44,7 +44,7 @@ export default function useNode(
     let value: number | undefined
     switch (viewOptions.highlightType) {
       case HighlightType.DURATION:
-        value = node[NodeProp.EXCLUSIVE_DURATION]
+        value = node[Property.EXCLUSIVE_DURATION]
         if (value === undefined) {
           highlightValue.value = null
           break
@@ -55,7 +55,7 @@ export default function useNode(
         highlightValue.value = formatDuration(value)
         break
       case HighlightType.ROWS:
-        value = node[NodeProp.ACTUAL_ROWS_REVISED]
+        value = node[Property.ACTUAL_ROWS_REVISED]
         if (value === undefined) {
           highlightValue.value = null
           break
@@ -67,7 +67,7 @@ export default function useNode(
         highlightValue.value = formatRows(value)
         break
       case HighlightType.COST:
-        value = node[NodeProp.EXCLUSIVE_COST]
+        value = node[Property.EXCLUSIVE_COST]
         if (value === undefined) {
           highlightValue.value = null
           break
@@ -86,18 +86,18 @@ export default function useNode(
 
   const nodeName = computed((): string => {
     let nodeName = isParallelAware.value ? "Parallel " : ""
-    nodeName += node[NodeProp.PARTIAL_MODE]
-      ? node[NodeProp.PARTIAL_MODE] + " "
+    nodeName += node[Property.PARTIAL_MODE]
+      ? node[Property.PARTIAL_MODE] + " "
       : ""
-    nodeName += node[NodeProp.NODE_TYPE]
+    nodeName += node[Property.NODE_TYPE]
     if (
-      node[NodeProp.SCAN_DIRECTION] &&
-      node[NodeProp.SCAN_DIRECTION] !== "Forward"
+      node[Property.SCAN_DIRECTION] &&
+      node[Property.SCAN_DIRECTION] !== "Forward"
     ) {
-      nodeName += " " + node[NodeProp.SCAN_DIRECTION]
+      nodeName += " " + node[Property.SCAN_DIRECTION]
     }
-    if (node[NodeProp.JOIN_TYPE]) {
-      nodeName = nodeName.replace("Join", `${node[NodeProp.JOIN_TYPE]} Join`);
+    if (node[Property.JOIN_TYPE]) {
+      nodeName = nodeName.replace("Join", `${node[Property.JOIN_TYPE]} Join`);
     }
     return nodeName
   })
@@ -106,33 +106,33 @@ export default function useNode(
     // use the first node total time if plan execution time is not available
     const executionTime =
       store.stats.executionTime ||
-      (store.plan?.content?.Plan?.[NodeProp.ACTUAL_TOTAL_TIME] as number)
-    const duration = node[NodeProp.EXCLUSIVE_DURATION] as number
+      (store.plan?.content?.Plan?.[Property.ACTUAL_TOTAL_TIME] as number)
+    const duration = node[Property.EXCLUSIVE_DURATION] as number
     executionTimePercent.value = _.round((duration / executionTime) * 100)
   }
 
   function calculateCost() {
     const maxTotalCost = store.plan?.content.maxTotalCost as number
-    const cost = node[NodeProp.EXCLUSIVE_COST] as number
+    const cost = node[Property.EXCLUSIVE_COST] as number
     costPercent.value = _.round((cost / maxTotalCost) * 100)
   }
 
-  type NodePropStrings = keyof typeof NodeProp
+  type NodePropStrings = keyof typeof Property
   const nodeKey = Object.keys(node).find(
     (key) =>
-      key === NodeProp.ROWS_REMOVED_BY_FILTER_REVISED ||
-      key === NodeProp.ROWS_REMOVED_BY_JOIN_FILTER_REVISED ||
-      key === NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED,
+      key === Property.ROWS_REMOVED_BY_FILTER_REVISED ||
+      key === Property.ROWS_REMOVED_BY_JOIN_FILTER_REVISED ||
+      key === Property.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED,
   )
-  const rowsRemovedProp: NodePropStrings = Object.keys(NodeProp).find(
-    (prop) => NodeProp[prop as NodePropStrings] === nodeKey,
+  const rowsRemovedProp: NodePropStrings = Object.keys(Property).find(
+    (prop) => Property[prop as NodePropStrings] === nodeKey,
   ) as NodePropStrings
 
   function calculateRowsRemoved() {
     if (rowsRemovedProp) {
-      const removed = node[NodeProp[rowsRemovedProp]] as number
+      const removed = node[Property[rowsRemovedProp]] as number
       rowsRemoved.value = removed
-      const actual = node[NodeProp.ACTUAL_ROWS_REVISED]
+      const actual = node[Property.ACTUAL_ROWS_REVISED]
       rowsRemovedPercent.value = _.floor((removed / (removed + actual)) * 100)
       if (rowsRemovedPercent.value === 100) {
         rowsRemovedPercentString.value = ">99"
@@ -162,7 +162,7 @@ export default function useNode(
 
   const estimationClass = computed(() => {
     let c
-    const i = node[NodeProp.PLANNER_ESTIMATE_FACTOR] as number
+    const i = node[Property.PLANNER_ESTIMATE_FACTOR] as number
     if (i > 1000) {
       c = 4
     } else if (i > 100) {
@@ -209,10 +209,10 @@ export default function useNode(
   const heapFetchesClass = computed(() => {
     let c
     const i =
-      ((node[NodeProp.HEAP_FETCHES] as number) /
-        ((node[NodeProp.ACTUAL_ROWS] as number) +
-          ((node[NodeProp.ROWS_REMOVED_BY_FILTER] as number) || 0) +
-          ((node[NodeProp.ROWS_REMOVED_BY_JOIN_FILTER] as number) || 0))) *
+      ((node[Property.HEAP_FETCHES] as number) /
+        ((node[Property.ACTUAL_ROWS] as number) +
+          ((node[Property.ROWS_REMOVED_BY_FILTER] as number) || 0) +
+          ((node[Property.ROWS_REMOVED_BY_JOIN_FILTER] as number) || 0))) *
       100
     if (i > 90) {
       c = 4
@@ -233,57 +233,57 @@ export default function useNode(
 
   const filterDetailTooltip = computed((): string => {
     return `Filter used:<br><pre class="mb-0" style="white-space: pre-wrap;"><code>${
-      node[NodeProp.FILTER]
+      node[Property.FILTER]
     }</code></pre>`
   })
 
   const indexRecheckTooltip = computed((): string => {
     return `Recheck condition:<br><pre class="mb-0" style="white-space: pre-wrap;"><code>${
-      node[NodeProp.RECHECK_COND]
+      node[Property.RECHECK_COND]
     }</code></pre>`
   })
 
   const isNeverExecuted = computed((): boolean => {
-    return !!store.stats.executionTime && !node[NodeProp.ACTUAL_LOOPS]
+    return !!store.stats.executionTime && !node[Property.ACTUAL_LOOPS]
   })
 
   const isParallelAware = computed((): boolean => {
-    return node[NodeProp.PARALLEL_AWARE]
+    return node[Property.PARALLEL_AWARE]
   })
 
   const workersLaunchedCount = computed((): number => {
     console.warn("Make sure it works for workers that are not array")
-    if (node[NodeProp.WORKERS_LAUNCHED]) {
-      return node[NodeProp.WORKERS_LAUNCHED] as number
+    if (node[Property.WORKERS_LAUNCHED]) {
+      return node[Property.WORKERS_LAUNCHED] as number
     }
-    if (node[NodeProp.WORKERS_LAUNCHED_BY_GATHER]) {
-      return node[NodeProp.WORKERS_LAUNCHED_BY_GATHER] as number
+    if (node[Property.WORKERS_LAUNCHED_BY_GATHER]) {
+      return node[Property.WORKERS_LAUNCHED_BY_GATHER] as number
     }
-    const workers = node[NodeProp.WORKERS] as Worker[]
+    const workers = node[Property.WORKERS] as Worker[]
     return workers ? workers.length : NaN
   })
 
   const workersPlannedCount = computed((): number => {
     return (
-      (node[NodeProp.WORKERS_LAUNCHED] as number) ||
-      (node[NodeProp.WORKERS_PLANNED_BY_GATHER] as number)
+      (node[Property.WORKERS_LAUNCHED] as number) ||
+      (node[Property.WORKERS_PLANNED_BY_GATHER] as number)
     )
   })
 
   const workersPlannedCountReversed = computed((): number[] => {
-    const workersPlanned = node[NodeProp.WORKERS_PLANNED_BY_GATHER]
+    const workersPlanned = node[Property.WORKERS_PLANNED_BY_GATHER]
     return [...Array(workersPlanned).keys()].slice().reverse()
   })
 
   const estimateFactorPercent = computed((): number => {
-    switch (node[NodeProp.PLANNER_ESTIMATE_FACTOR]) {
+    switch (node[Property.PLANNER_ESTIMATE_FACTOR]) {
       case Infinity:
         return 100
       case 1:
         return 0
       default:
         return (
-          ((node[NodeProp.PLANNER_ESTIMATE_FACTOR] || 0) /
+          ((node[Property.PLANNER_ESTIMATE_FACTOR] || 0) /
             store.stats.maxEstimateFactor) *
           100
         )
@@ -292,7 +292,7 @@ export default function useNode(
 
   const sharedHitPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS] /
+      (node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.shared]) *
       100
     )
@@ -300,7 +300,7 @@ export default function useNode(
 
   const sharedReadPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS] /
+      (node[Property.EXCLUSIVE_SHARED_READ_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.shared]) *
       100
     )
@@ -308,7 +308,7 @@ export default function useNode(
 
   const sharedDirtiedPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] /
+      (node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.shared]) *
       100
     )
@@ -316,7 +316,7 @@ export default function useNode(
 
   const sharedWrittenPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] /
+      (node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.shared]) *
       100
     )
@@ -324,7 +324,7 @@ export default function useNode(
 
   const tempReadPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS] /
+      (node[Property.EXCLUSIVE_TEMP_READ_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.temp]) *
       100
     )
@@ -332,7 +332,7 @@ export default function useNode(
 
   const tempWrittenPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] /
+      (node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.temp]) *
       100
     )
@@ -340,7 +340,7 @@ export default function useNode(
 
   const localHitPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS] /
+      (node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.local]) *
       100
     )
@@ -348,7 +348,7 @@ export default function useNode(
 
   const localReadPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS] /
+      (node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.local]) *
       100
     )
@@ -356,7 +356,7 @@ export default function useNode(
 
   const localDirtiedPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] /
+      (node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.local]) *
       100
     )
@@ -364,21 +364,21 @@ export default function useNode(
 
   const localWrittenPercent = computed((): number => {
     return (
-      (node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] /
+      (node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] /
         store.stats.maxBlocks?.[BufferLocation.local]) *
       100
     )
   })
 
   const rowsTooltip = computed((): string => {
-    return ["Rows: ", formatRows(node[NodeProp.ACTUAL_ROWS_REVISED] as number)].join(
+    return ["Rows: ", formatRows(node[Property.ACTUAL_ROWS_REVISED] as number)].join(
       "",
     )
   })
 
   const estimateFactorTooltip = computed((): string => {
-    const estimateFactor = node[NodeProp.PLANNER_ESTIMATE_FACTOR]
-    const estimateDirection = node[NodeProp.PLANNER_ESTIMATE_DIRECTION]
+    const estimateFactor = node[Property.PLANNER_ESTIMATE_FACTOR]
+    const estimateDirection = node[Property.PLANNER_ESTIMATE_DIRECTION]
     let text = ""
     if (estimateFactor === undefined || estimateDirection === undefined) {
       return "N/A"
@@ -397,25 +397,25 @@ export default function useNode(
     text +=
       estimateFactor !== 1 ? " by <b>" + formatFactor(estimateFactor) + "</b>" : ""
     text += "<br>"
-    text += `Rows: ${formatRows(node[NodeProp.ACTUAL_ROWS_REVISED])} `
-    text += `(${formatRows(node[NodeProp.PLAN_ROWS_REVISED] as number)} planned)`
+    text += `Rows: ${formatRows(node[Property.ACTUAL_ROWS_REVISED])} `
+    text += `(${formatRows(node[Property.PLAN_ROWS_REVISED] as number)} planned)`
     return text
   })
 
   const costTooltip = computed((): string => {
-    return ["Cost: ", formatRows(node[NodeProp.EXCLUSIVE_COST] as number)].join("")
+    return ["Cost: ", formatRows(node[Property.EXCLUSIVE_COST] as number)].join("")
   })
 
   const rowsRemovedTooltip = computed((): string => {
-    return `${NodeProp[rowsRemovedProp]}: ${tilde.value}${formatRows(rowsRemoved.value)}`
+    return `${Property[rowsRemovedProp]}: ${tilde.value}${formatRows(rowsRemoved.value)}`
   })
 
   const rowsIsFractional = computed((): boolean => {
-    return !!node[NodeProp.ACTUAL_ROWS_FRACTIONAL]
+    return !!node[Property.ACTUAL_ROWS_FRACTIONAL]
   })
 
   const hasSeveralLoops = computed((): boolean => {
-    return (node[NodeProp.ACTUAL_LOOPS] as number) > 1
+    return (node[Property.ACTUAL_LOOPS] as number) > 1
   })
 
   const tilde = computed((): string => {
@@ -432,20 +432,20 @@ export default function useNode(
         let dirtied
         switch (location) {
           case BufferLocation.shared:
-            hit = node[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS]
-            read = node[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS]
-            dirtied = node[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
-            written = node[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
+            hit = node[Property.EXCLUSIVE_SHARED_HIT_BLOCKS]
+            read = node[Property.EXCLUSIVE_SHARED_READ_BLOCKS]
+            dirtied = node[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS]
+            written = node[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS]
             break
           case BufferLocation.temp:
-            read = node[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS]
-            written = node[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
+            read = node[Property.EXCLUSIVE_TEMP_READ_BLOCKS]
+            written = node[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS]
             break
           case BufferLocation.local:
-            hit = node[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS]
-            read = node[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS]
-            dirtied = node[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
-            written = node[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
+            hit = node[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS]
+            read = node[Property.EXCLUSIVE_LOCAL_READ_BLOCKS]
+            dirtied = node[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS]
+            written = node[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS]
             break
         }
         text += '<table class="table table-sm table-borderless mb-0">'
@@ -490,7 +490,7 @@ export default function useNode(
       },
   )
 
-  const buffersByMetricTooltip = computed(() => (metric: NodeProp): string => {
+  const buffersByMetricTooltip = computed(() => (metric: Property): string => {
     let text = '<table class="table table-sm table-borderless mb-0">'
     text += `<tr><td>${metric}:</td><td class="text-end">`
     if (node[metric]) {
@@ -500,14 +500,14 @@ export default function useNode(
   })
 
   const heapFetchesTooltip = computed((): string => {
-    return `Heap Fetches: ${node[NodeProp.HEAP_FETCHES]?.toLocaleString()}`
+    return `Heap Fetches: ${node[Property.HEAP_FETCHES]?.toLocaleString()}`
   })
 
   // returns the formatted prop
-  function formattedProp(propName: keyof typeof NodeProp) {
-    const property = NodeProp[propName]
+  function formattedProp(propName: keyof typeof Property) {
+    const property = Property[propName]
     const value = node[property]
-    return formatNodeProp(property, value)
+    return formatProp(property, value)
   }
 
   return {
diff --git a/src/services/__tests__/05-parallel-jit.ts b/src/services/__tests__/05-parallel-jit.ts
index d9c2e51e..182baf7d 100644
--- a/src/services/__tests__/05-parallel-jit.ts
+++ b/src/services/__tests__/05-parallel-jit.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it } from "vitest"
 import { PlanService } from "@/services/plan-service"
 import type { IPlan, IPlanContent } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 
 import { findNodeById } from "@/services/help-service"
 
@@ -164,6 +164,6 @@ Execution Time: 1639.241 ms
   const plan: IPlan = planService.createPlan("", r, "")
   it("takes workers into account", () => {
     const parallelhashjoin = findNodeById(plan, 5)
-    expect(parallelhashjoin?.[NodeProp.NODE_TYPE]).toBe("Hash Join")
+    expect(parallelhashjoin?.[Property.NODE_TYPE]).toBe("Hash Join")
   })
 })
diff --git a/src/services/__tests__/cte-exclusive-time.spec.ts b/src/services/__tests__/cte-exclusive-time.spec.ts
index 14a32575..27bbc78f 100644
--- a/src/services/__tests__/cte-exclusive-time.spec.ts
+++ b/src/services/__tests__/cte-exclusive-time.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "vitest"
 import type { IPlan, IPlanContent, Node } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 import { PlanService } from "@/services/plan-service"
 import _ from "lodash"
 import * as fs from "fs"
@@ -14,9 +14,9 @@ let tests = files.map((file: string) => file.replace(/\..*/, ""))
 
 function sumExclusiveDuration(nodes: Node[]): number {
   return _.sumBy(nodes, (node) => {
-    const baseValue = node[NodeProp.EXCLUSIVE_DURATION]
-    const childrenSum = node[NodeProp.PLANS]
-      ? sumExclusiveDuration(node[NodeProp.PLANS])
+    const baseValue = node[Property.EXCLUSIVE_DURATION]
+    const childrenSum = node[Property.PLANS]
+      ? sumExclusiveDuration(node[Property.PLANS])
       : 0
     return baseValue + childrenSum
   })
@@ -34,8 +34,8 @@ tests.forEach((planTest: string) => {
 
       // Excpect the sum of exclusives to be approvimatively equal to the
       // duration of the root node
-      const min = (plan.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] || 0) * 0.99
-      const max = (plan.content.Plan[NodeProp.ACTUAL_TOTAL_TIME] || 0) * 1.01
+      const min = (plan.content.Plan[Property.ACTUAL_TOTAL_TIME] || 0) * 0.99
+      const max = (plan.content.Plan[Property.ACTUAL_TOTAL_TIME] || 0) * 1.01
       expect(
         sumExclusiveDuration([plan.content.Plan].concat(plan.ctes)),
       ).toBeGreaterThan(min)
diff --git a/src/services/__tests__/worker-actual-rows.spec.ts b/src/services/__tests__/worker-actual-rows.spec.ts
index e5e54c01..891f734a 100644
--- a/src/services/__tests__/worker-actual-rows.spec.ts
+++ b/src/services/__tests__/worker-actual-rows.spec.ts
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest"
 import { PlanService } from "@/services/plan-service"
 import type { IPlan, IPlanContent } from "@/interfaces"
-import { NodeProp } from "@/enums"
+import { Property } from "@/enums"
 
 describe("Worker rows parsing", () => {
   const planService = new PlanService()
@@ -21,27 +21,27 @@ Execution Time: 60.0 ms
   const root = plan.content.Plan
 
   test("Node has workers", () => {
-    expect(root[NodeProp.WORKERS]).toBeDefined()
-    expect(root[NodeProp.WORKERS]).toHaveLength(2)
+    expect(root[Property.WORKERS]).toBeDefined()
+    expect(root[Property.WORKERS]).toHaveLength(2)
   })
 
   test("Worker 0 has all parsed properties", () => {
-    const worker0 = root[NodeProp.WORKERS]?.[0]
+    const worker0 = root[Property.WORKERS]?.[0]
     expect(worker0).toBeDefined()
     expect(worker0?.["Worker Number"]).toBe(0)
-    expect(worker0?.[NodeProp.ACTUAL_ROWS]).toBe(348636)
-    expect(worker0?.[NodeProp.ACTUAL_LOOPS]).toBe(1)
-    expect(worker0?.[NodeProp.ACTUAL_TOTAL_TIME]).toBeCloseTo(57.944, 3)
-    expect(worker0?.[NodeProp.ACTUAL_STARTUP_TIME]).toBeCloseTo(0.067, 3)
+    expect(worker0?.[Property.ACTUAL_ROWS]).toBe(348636)
+    expect(worker0?.[Property.ACTUAL_LOOPS]).toBe(1)
+    expect(worker0?.[Property.ACTUAL_TOTAL_TIME]).toBeCloseTo(57.944, 3)
+    expect(worker0?.[Property.ACTUAL_STARTUP_TIME]).toBeCloseTo(0.067, 3)
   })
 
   test("Worker 1 has all parsed properties", () => {
-    const worker1 = root[NodeProp.WORKERS]?.[1]
+    const worker1 = root[Property.WORKERS]?.[1]
     expect(worker1).toBeDefined()
     expect(worker1?.["Worker Number"]).toBe(1)
-    expect(worker1?.[NodeProp.ACTUAL_ROWS]).toBe(351339)
-    expect(worker1?.[NodeProp.ACTUAL_LOOPS]).toBe(1)
-    expect(worker1?.[NodeProp.ACTUAL_TOTAL_TIME]).toBeCloseTo(58.986, 3)
-    expect(worker1?.[NodeProp.ACTUAL_STARTUP_TIME]).toBeCloseTo(0.038, 3)
+    expect(worker1?.[Property.ACTUAL_ROWS]).toBe(351339)
+    expect(worker1?.[Property.ACTUAL_LOOPS]).toBe(1)
+    expect(worker1?.[Property.ACTUAL_TOTAL_TIME]).toBeCloseTo(58.986, 3)
+    expect(worker1?.[Property.ACTUAL_STARTUP_TIME]).toBeCloseTo(0.038, 3)
   })
 })
diff --git a/src/services/help-service.ts b/src/services/help-service.ts
index 92cb4975..ced47440 100644
--- a/src/services/help-service.ts
+++ b/src/services/help-service.ts
@@ -1,6 +1,6 @@
 import _ from "lodash"
 import type { IPlan, Node } from "@/interfaces"
-import { NodeProp, WorkerProp } from "@/enums"
+import { Property } from "@/enums"
 
 export function getNodeTypeDescription(nodeType: string): string | undefined {
   return NODE_DESCRIPTIONS[nodeType.toUpperCase()]
@@ -273,7 +273,7 @@ export function findNodeBySubplanName(
   let o: Node | undefined = undefined
   if (plan.ctes) {
     _.each(plan.ctes, (cte) => {
-      if (cte[NodeProp.SUBPLAN_NAME] == "CTE " + subplanName) {
+      if (cte[Property.SUBPLAN_NAME] == "CTE " + subplanName) {
         o = cte
         return false
       }
@@ -285,121 +285,122 @@ export function findNodeBySubplanName(
 // Returns the list of properties that have already been displayed either in
 // the main panel or in other detailed tabs.
 const notMiscProperties: string[] = [
-  NodeProp.NODE_TYPE,
-  NodeProp.CTE_NAME,
-  NodeProp.EXCLUSIVE_DURATION,
-  NodeProp.EXCLUSIVE_COST,
-  NodeProp.TOTAL_COST,
-  NodeProp.PLAN_ROWS,
-  NodeProp.ACTUAL_ROWS,
-  NodeProp.ACTUAL_LOOPS,
-  NodeProp.OUTPUT,
-  NodeProp.WORKERS,
-  NodeProp.WORKERS_PLANNED,
-  NodeProp.WORKERS_LAUNCHED,
-  NodeProp.READ_BLOCKS,
-  NodeProp.WRITTEN_BLOCKS,
-  NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS,
-  NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS,
-  NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS,
-  NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS,
-  NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS,
-  NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS,
-  NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS,
-  NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS,
-  NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS,
-  NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS,
-  NodeProp.EXCLUSIVE_READ_BLOCKS,
-  NodeProp.EXCLUSIVE_WRITTEN_BLOCKS,
-  NodeProp.SHARED_HIT_BLOCKS,
-  NodeProp.SHARED_READ_BLOCKS,
-  NodeProp.SHARED_DIRTIED_BLOCKS,
-  NodeProp.SHARED_WRITTEN_BLOCKS,
-  NodeProp.TEMP_READ_BLOCKS,
-  NodeProp.TEMP_WRITTEN_BLOCKS,
-  NodeProp.LOCAL_HIT_BLOCKS,
-  NodeProp.LOCAL_READ_BLOCKS,
-  NodeProp.LOCAL_DIRTIED_BLOCKS,
-  NodeProp.LOCAL_WRITTEN_BLOCKS,
-  NodeProp.PLANNER_ESTIMATE_FACTOR,
-  NodeProp.PLANNER_ESTIMATE_DIRECTION,
-  NodeProp.SUBPLAN_NAME,
-  NodeProp.GROUP_KEY,
-  NodeProp.HASH_CONDITION,
-  NodeProp.JOIN_TYPE,
-  NodeProp.INDEX_NAME,
-  NodeProp.HASH_CONDITION,
-  NodeProp.EXCLUSIVE_IO_READ_TIME,
-  NodeProp.EXCLUSIVE_IO_WRITE_TIME,
-  NodeProp.EXCLUSIVE_SHARED_IO_READ_TIME,
-  NodeProp.EXCLUSIVE_SHARED_IO_WRITE_TIME,
-  NodeProp.EXCLUSIVE_LOCAL_IO_READ_TIME,
-  NodeProp.EXCLUSIVE_LOCAL_IO_WRITE_TIME,
-  NodeProp.EXCLUSIVE_TEMP_IO_READ_TIME,
-  NodeProp.EXCLUSIVE_TEMP_IO_WRITE_TIME,
-  NodeProp.EXCLUSIVE_AVERAGE_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_LOCAL_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_LOCAL_IO_WRITE_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_TEMP_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_TEMP_IO_WRITE_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED,
-  NodeProp.EXCLUSIVE_SUM_IO_READ_TIME,
-  NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME,
-  NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED,
-  NodeProp.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED,
-  NodeProp.AVERAGE_IO_READ_SPEED,
-  NodeProp.AVERAGE_IO_WRITE_SPEED,
-  NodeProp.AVERAGE_SHARED_IO_READ_SPEED,
-  NodeProp.AVERAGE_SHARED_IO_WRITE_SPEED,
-  NodeProp.AVERAGE_LOCAL_IO_READ_SPEED,
-  NodeProp.AVERAGE_LOCAL_IO_WRITE_SPEED,
-  NodeProp.AVERAGE_TEMP_IO_READ_SPEED,
-  NodeProp.AVERAGE_TEMP_IO_WRITE_SPEED,
-  NodeProp.IO_READ_TIME,
-  NodeProp.IO_WRITE_TIME,
-  NodeProp.SHARED_IO_READ_TIME,
-  NodeProp.SHARED_IO_WRITE_TIME,
-  NodeProp.LOCAL_IO_READ_TIME,
-  NodeProp.LOCAL_IO_WRITE_TIME,
-  NodeProp.TEMP_IO_READ_TIME,
-  NodeProp.TEMP_IO_WRITE_TIME,
-  NodeProp.SUM_IO_READ_TIME,
-  NodeProp.SUM_IO_WRITE_TIME,
-  NodeProp.AVERAGE_SUM_IO_READ_SPEED,
-  NodeProp.AVERAGE_SUM_IO_WRITE_SPEED,
-  NodeProp.HEAP_FETCHES,
-  NodeProp.WAL_RECORDS,
-  NodeProp.WAL_BYTES,
-  NodeProp.WAL_FPI,
-  NodeProp.NODE_ID,
-  NodeProp.ROWS_REMOVED_BY_FILTER,
-  NodeProp.ROWS_REMOVED_BY_JOIN_FILTER,
-  NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK,
-  NodeProp.ACTUAL_ROWS_REVISED,
-  NodeProp.PLAN_ROWS_REVISED,
-  NodeProp.ROWS_REMOVED_BY_FILTER_REVISED,
-  NodeProp.ROWS_REMOVED_BY_JOIN_FILTER_REVISED,
-  NodeProp.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED,
+  Property.NODE_TYPE,
+  Property.CTE_NAME,
+  Property.EXCLUSIVE_DURATION,
+  Property.EXCLUSIVE_COST,
+  Property.TOTAL_COST,
+  Property.PLAN_ROWS,
+  Property.ACTUAL_ROWS,
+  Property.ACTUAL_LOOPS,
+  Property.OUTPUT,
+  Property.WORKERS,
+  Property.WORKERS_PLANNED,
+  Property.WORKERS_LAUNCHED,
+  Property.READ_BLOCKS,
+  Property.WRITTEN_BLOCKS,
+  Property.EXCLUSIVE_SHARED_HIT_BLOCKS,
+  Property.EXCLUSIVE_SHARED_READ_BLOCKS,
+  Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS,
+  Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS,
+  Property.EXCLUSIVE_TEMP_READ_BLOCKS,
+  Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS,
+  Property.EXCLUSIVE_LOCAL_HIT_BLOCKS,
+  Property.EXCLUSIVE_LOCAL_READ_BLOCKS,
+  Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS,
+  Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS,
+  Property.EXCLUSIVE_READ_BLOCKS,
+  Property.EXCLUSIVE_WRITTEN_BLOCKS,
+  Property.SHARED_HIT_BLOCKS,
+  Property.SHARED_READ_BLOCKS,
+  Property.SHARED_DIRTIED_BLOCKS,
+  Property.SHARED_WRITTEN_BLOCKS,
+  Property.TEMP_READ_BLOCKS,
+  Property.TEMP_WRITTEN_BLOCKS,
+  Property.LOCAL_HIT_BLOCKS,
+  Property.LOCAL_READ_BLOCKS,
+  Property.LOCAL_DIRTIED_BLOCKS,
+  Property.LOCAL_WRITTEN_BLOCKS,
+  Property.PLANNER_ESTIMATE_FACTOR,
+  Property.PLANNER_ESTIMATE_DIRECTION,
+  Property.SUBPLAN_NAME,
+  Property.GROUP_KEY,
+  Property.HASH_CONDITION,
+  Property.JOIN_TYPE,
+  Property.INDEX_NAME,
+  Property.HASH_CONDITION,
+  Property.EXCLUSIVE_IO_READ_TIME,
+  Property.EXCLUSIVE_IO_WRITE_TIME,
+  Property.EXCLUSIVE_SHARED_IO_READ_TIME,
+  Property.EXCLUSIVE_SHARED_IO_WRITE_TIME,
+  Property.EXCLUSIVE_LOCAL_IO_READ_TIME,
+  Property.EXCLUSIVE_LOCAL_IO_WRITE_TIME,
+  Property.EXCLUSIVE_TEMP_IO_READ_TIME,
+  Property.EXCLUSIVE_TEMP_IO_WRITE_TIME,
+  Property.EXCLUSIVE_AVERAGE_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED,
+  Property.EXCLUSIVE_AVERAGE_SHARED_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_SHARED_IO_WRITE_SPEED,
+  Property.EXCLUSIVE_AVERAGE_LOCAL_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_LOCAL_IO_WRITE_SPEED,
+  Property.EXCLUSIVE_AVERAGE_TEMP_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_TEMP_IO_WRITE_SPEED,
+  Property.EXCLUSIVE_AVERAGE_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_IO_WRITE_SPEED,
+  Property.EXCLUSIVE_SUM_IO_READ_TIME,
+  Property.EXCLUSIVE_SUM_IO_WRITE_TIME,
+  Property.EXCLUSIVE_AVERAGE_SUM_IO_READ_SPEED,
+  Property.EXCLUSIVE_AVERAGE_SUM_IO_WRITE_SPEED,
+  Property.AVERAGE_IO_READ_SPEED,
+  Property.AVERAGE_IO_WRITE_SPEED,
+  Property.AVERAGE_SHARED_IO_READ_SPEED,
+  Property.AVERAGE_SHARED_IO_WRITE_SPEED,
+  Property.AVERAGE_LOCAL_IO_READ_SPEED,
+  Property.AVERAGE_LOCAL_IO_WRITE_SPEED,
+  Property.AVERAGE_TEMP_IO_READ_SPEED,
+  Property.AVERAGE_TEMP_IO_WRITE_SPEED,
+  Property.IO_READ_TIME,
+  Property.IO_WRITE_TIME,
+  Property.SHARED_IO_READ_TIME,
+  Property.SHARED_IO_WRITE_TIME,
+  Property.LOCAL_IO_READ_TIME,
+  Property.LOCAL_IO_WRITE_TIME,
+  Property.TEMP_IO_READ_TIME,
+  Property.TEMP_IO_WRITE_TIME,
+  Property.SUM_IO_READ_TIME,
+  Property.SUM_IO_WRITE_TIME,
+  Property.AVERAGE_SUM_IO_READ_SPEED,
+  Property.AVERAGE_SUM_IO_WRITE_SPEED,
+  Property.HEAP_FETCHES,
+  Property.WAL_RECORDS,
+  Property.WAL_BYTES,
+  Property.WAL_FPI,
+  Property.NODE_ID,
+  Property.ROWS_REMOVED_BY_FILTER,
+  Property.ROWS_REMOVED_BY_JOIN_FILTER,
+  Property.ROWS_REMOVED_BY_INDEX_RECHECK,
+  Property.ACTUAL_ROWS_REVISED,
+  Property.PLAN_ROWS_REVISED,
+  Property.ROWS_REMOVED_BY_FILTER_REVISED,
+  Property.ROWS_REMOVED_BY_JOIN_FILTER_REVISED,
+  Property.ROWS_REMOVED_BY_INDEX_RECHECK_REVISED,
   "size", // Manually added to use FlexTree
-  NodeProp.RELATION_NAME,
-  NodeProp.ALIAS,
-  NodeProp.FUNCTION_NAME,
-  NodeProp.STRATEGY,
-  NodeProp.PARTIAL_MODE,
-  NodeProp.SCAN_DIRECTION,
-  NodeProp.ACTUAL_ROWS_FRACTIONAL,
-  NodeProp.DISABLED,
+  Property.RELATION_NAME,
+  Property.ALIAS,
+  Property.FUNCTION_NAME,
+  Property.STRATEGY,
+  Property.PARTIAL_MODE,
+  Property.SCAN_DIRECTION,
+  Property.ACTUAL_ROWS_FRACTIONAL,
+  Property.DISABLED,
+  Property.WORKER_NUMBER,
 ]
 
 export function shouldShowProp(key: string, value: unknown): boolean {
   return (
     (!!value ||
-      key === WorkerProp.WORKER_NUMBER ||
-      key === NodeProp.ACTUAL_ROWS) &&
+      key === Property.WORKER_NUMBER ||
+      key === Property.ACTUAL_ROWS) &&
     notMiscProperties.indexOf(key) === -1
   )
 }
diff --git a/src/services/plan-service.ts b/src/services/plan-service.ts
index 75e80c02..7f48e393 100644
--- a/src/services/plan-service.ts
+++ b/src/services/plan-service.ts
@@ -2,10 +2,7 @@ import _ from "lodash"
 import {
   BufferLocation,
   EstimateDirection,
-  SortGroupsProp,
-  NodeProp,
-  SortSpaceMemoryProp,
-  WorkerProp,
+  Property,
 } from "@/enums"
 import { splitBalanced } from "@/services/help-service"
 import type {
@@ -37,7 +34,7 @@ export class PlanService {
   private flat: Node[] = []
 
   private recurse(nodes: Node[]): recurseItemType {
-    return _.map(nodes, (node) => [node, this.recurse(node[NodeProp.PLANS])])
+    return _.map(nodes, (node) => [node, this.recurse(node[Property.PLANS])])
   }
 
   public createPlan(
@@ -53,14 +50,14 @@ export class PlanService {
     planQuery = planQuery.replace(/(\S)(?!$)(\s{2,})/gm, "$1 ")
 
     const plan: IPlan = {
-      id: NodeProp.PEV_PLAN_TAG + new Date().getTime().toString(),
+      id: Property.PEV_PLAN_TAG + new Date().getTime().toString(),
       name: planName || "plan created on " + new Date().toDateString(),
       createdOn: new Date(),
       content: planContent,
       query: planQuery,
       planStats: {} as IPlanStats,
       ctes: [],
-      isAnalyze: _.has(planContent.Plan, NodeProp.ACTUAL_ROWS),
+      isAnalyze: _.has(planContent.Plan, Property.ACTUAL_ROWS),
       isVerbose: this.findOutputProperty(planContent.Plan),
     }
 
@@ -83,8 +80,8 @@ export class PlanService {
 
   public isCTE(node: Node) {
     return (
-      node[NodeProp.PARENT_RELATIONSHIP] === "InitPlan" &&
-      _.startsWith(node[NodeProp.SUBPLAN_NAME], "CTE")
+      node[Property.PARENT_RELATIONSHIP] === "InitPlan" &&
+      _.startsWith(node[Property.SUBPLAN_NAME], "CTE")
     )
   }
 
@@ -93,19 +90,19 @@ export class PlanService {
     node.nodeId = this.nodeId++
     this.calculatePlannerEstimate(node)
 
-    _.each(node[NodeProp.PLANS], (child) => {
+    _.each(node[Property.PLANS], (child) => {
       // Disseminate workers planned info to parallel nodes (ie. Gather children)
       if (
         !this.isCTE(child) &&
-        child[NodeProp.PARENT_RELATIONSHIP] !== "InitPlan" &&
-        child[NodeProp.PARENT_RELATIONSHIP] !== "SubPlan"
+        child[Property.PARENT_RELATIONSHIP] !== "InitPlan" &&
+        child[Property.PARENT_RELATIONSHIP] !== "SubPlan"
       ) {
-        child[NodeProp.WORKERS_PLANNED_BY_GATHER] =
-          node[NodeProp.WORKERS_PLANNED] ||
-          node[NodeProp.WORKERS_PLANNED_BY_GATHER]
-        child[NodeProp.WORKERS_LAUNCHED_BY_GATHER] =
-          node[NodeProp.WORKERS_LAUNCHED] ||
-          node[NodeProp.WORKERS_LAUNCHED_BY_GATHER]
+        child[Property.WORKERS_PLANNED_BY_GATHER] =
+          node[Property.WORKERS_PLANNED] ||
+          node[Property.WORKERS_PLANNED_BY_GATHER]
+        child[Property.WORKERS_LAUNCHED_BY_GATHER] =
+          node[Property.WORKERS_LAUNCHED] ||
+          node[Property.WORKERS_LAUNCHED_BY_GATHER]
       }
       if (this.isCTE(child)) {
         plan.ctes.push(child)
@@ -113,7 +110,7 @@ export class PlanService {
       this.processNode(child, plan)
     })
 
-    _.remove(node[NodeProp.PLANS], (child) => this.isCTE(child))
+    _.remove(node[Property.PLANS], (child) => this.isCTE(child))
 
     // calculate actuals after processing child nodes so that actual duration
     // takes loops into account
@@ -124,24 +121,24 @@ export class PlanService {
   }
 
   public calculateMaximums(plan: IPlan) {
-    const largest = _.maxBy(this.flat, NodeProp.ACTUAL_ROWS_REVISED)
+    const largest = _.maxBy(this.flat, Property.ACTUAL_ROWS_REVISED)
     if (largest) {
-      plan.content.maxRows = largest[NodeProp.ACTUAL_ROWS_REVISED] as number
+      plan.content.maxRows = largest[Property.ACTUAL_ROWS_REVISED] as number
     }
 
-    const costliest = _.maxBy(this.flat, NodeProp.EXCLUSIVE_COST)
+    const costliest = _.maxBy(this.flat, Property.EXCLUSIVE_COST)
     if (costliest) {
-      plan.content.maxCost = costliest[NodeProp.EXCLUSIVE_COST] as number
+      plan.content.maxCost = costliest[Property.EXCLUSIVE_COST] as number
     }
 
-    const totalCostliest = _.maxBy(this.flat, NodeProp.TOTAL_COST)
+    const totalCostliest = _.maxBy(this.flat, Property.TOTAL_COST)
     if (totalCostliest) {
-      plan.content.maxTotalCost = totalCostliest[NodeProp.TOTAL_COST] as number
+      plan.content.maxTotalCost = totalCostliest[Property.TOTAL_COST] as number
     }
 
-    const slowest = _.maxBy(this.flat, NodeProp.EXCLUSIVE_DURATION)
+    const slowest = _.maxBy(this.flat, Property.EXCLUSIVE_DURATION)
     if (slowest) {
-      plan.content.maxDuration = slowest[NodeProp.EXCLUSIVE_DURATION] as number
+      plan.content.maxDuration = slowest[Property.EXCLUSIVE_DURATION] as number
     }
 
     if (!plan.content.maxBlocks) {
@@ -150,10 +147,10 @@ export class PlanService {
 
     function sumShared(o: Node): number {
       return (
-        (o[NodeProp.EXCLUSIVE_SHARED_HIT_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_SHARED_READ_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] as number)
+        (o[Property.EXCLUSIVE_SHARED_HIT_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_SHARED_READ_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_SHARED_DIRTIED_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_SHARED_WRITTEN_BLOCKS] as number)
       )
     }
     const highestShared = _.maxBy(this.flat, (o) => {
@@ -165,8 +162,8 @@ export class PlanService {
 
     function sumTemp(o: Node): number {
       return (
-        (o[NodeProp.EXCLUSIVE_TEMP_READ_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] as number)
+        (o[Property.EXCLUSIVE_TEMP_READ_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_TEMP_WRITTEN_BLOCKS] as number)
       )
     }
     const highestTemp = _.maxBy(this.flat, (o) => {
@@ -178,10 +175,10 @@ export class PlanService {
 
     function sumLocal(o: Node) {
       return (
-        (o[NodeProp.EXCLUSIVE_LOCAL_HIT_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_LOCAL_READ_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] as number) +
-        (o[NodeProp.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] as number)
+        (o[Property.EXCLUSIVE_LOCAL_HIT_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_LOCAL_READ_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_LOCAL_DIRTIED_BLOCKS] as number) +
+        (o[Property.EXCLUSIVE_LOCAL_WRITTEN_BLOCKS] as number)
       )
     }
     const highestLocal = _.maxBy(this.flat, (o) => {
@@ -196,8 +193,8 @@ export class PlanService {
     }
     function sumIo(o: Node) {
       return (
-        (o[NodeProp.EXCLUSIVE_SUM_IO_READ_TIME] as number) +
-        (o[NodeProp.EXCLUSIVE_SUM_IO_WRITE_TIME] as number)
+        (o[Property.EXCLUSIVE_SUM_IO_READ_TIME] as number) +
+        (o[Property.EXCLUSIVE_SUM_IO_WRITE_TIME] as number)
       )
     }
     const highestIo = _.maxBy(this.flat, (o) => {
@@ -209,7 +206,7 @@ export class PlanService {
 
     const highestEstimateFactor = _.max(
       _.map(this.flat, (node) => {
-        const f = node[NodeProp.PLANNER_ESTIMATE_FACTOR]
+        const f = node[Property.PLANNER_ESTIMATE_FACTOR]
         if (f !== Infinity) {
           return f
         }
@@ -220,40 +217,40 @@ export class PlanService {
 
   // actual duration and actual cost are calculated by subtracting child values from the total
   public calculateActuals(node: Node) {
-    if (!_.isUndefined(node[NodeProp.ACTUAL_TOTAL_TIME])) {
+    if (!_.isUndefined(node[Property.ACTUAL_TOTAL_TIME])) {
       // since time is reported for an invidual loop, actual duration must be adjusted by number of loops
       // number of workers is also taken into account
-      const workers = (node[NodeProp.WORKERS_LAUNCHED_BY_GATHER] || 0) + 1
-      node[NodeProp.ACTUAL_TOTAL_TIME] =
-        ((node[NodeProp.ACTUAL_TOTAL_TIME] as number) *
-          (node[NodeProp.ACTUAL_LOOPS] as number)) /
+      const workers = (node[Property.WORKERS_LAUNCHED_BY_GATHER] || 0) + 1
+      node[Property.ACTUAL_TOTAL_TIME] =
+        ((node[Property.ACTUAL_TOTAL_TIME] as number) *
+          (node[Property.ACTUAL_LOOPS] as number)) /
         workers
-      node[NodeProp.ACTUAL_STARTUP_TIME] =
-        ((node[NodeProp.ACTUAL_STARTUP_TIME] as number) *
-          (node[NodeProp.ACTUAL_LOOPS] as number)) /
+      node[Property.ACTUAL_STARTUP_TIME] =
+        ((node[Property.ACTUAL_STARTUP_TIME] as number) *
+          (node[Property.ACTUAL_LOOPS] as number)) /
         workers
-      node[NodeProp.EXCLUSIVE_DURATION] = node[NodeProp.ACTUAL_TOTAL_TIME] as number
+      node[Property.EXCLUSIVE_DURATION] = node[Property.ACTUAL_TOTAL_TIME] as number
 
       const duration =
-        (node[NodeProp.EXCLUSIVE_DURATION] as number) -
+        (node[Property.EXCLUSIVE_DURATION] as number) -
         this.childrenDuration(node, 0)
-      node[NodeProp.EXCLUSIVE_DURATION] = duration > 0 ? duration : 0
+      node[Property.EXCLUSIVE_DURATION] = duration > 0 ? duration : 0
     }
 
-    if (!_.isUndefined(node[NodeProp.TOTAL_COST])) {
-      node[NodeProp.EXCLUSIVE_COST] = node[NodeProp.TOTAL_COST]
+    if (!_.isUndefined(node[Property.TOTAL_COST])) {
+      node[Property.EXCLUSIVE_COST] = node[Property.TOTAL_COST]
     }
 
-    _.each(node[NodeProp.PLANS], (subPlan) => {
-      if (subPlan[NodeProp.TOTAL_COST]) {
-        node[NodeProp.EXCLUSIVE_COST] =
-          (node[NodeProp.EXCLUSIVE_COST] as number) -
-          (subPlan[NodeProp.TOTAL_COST] as number)
+    _.each(node[Property.PLANS], (subPlan) => {
+      if (subPlan[Property.TOTAL_COST]) {
+        node[Property.EXCLUSIVE_COST] =
+          (node[Property.EXCLUSIVE_COST] as number) -
+          (subPlan[Property.TOTAL_COST] as number)
       }
     })
 
-    if ((node[NodeProp.EXCLUSIVE_COST] as number) < 0) {
-      node[NodeProp.EXCLUSIVE_COST] = 0
+    if ((node[Property.EXCLUSIVE_COST] as number) < 0) {
+      node[Property.EXCLUSIVE_COST] = 0
     }
 
     _.each(
@@ -264,12 +261,12 @@ export class PlanService {
         "ROWS_REMOVED_BY_JOIN_FILTER",
         "ROWS_REMOVED_BY_INDEX_RECHECK",
       ],
-      (prop: keyof typeof NodeProp) => {
-        if (!_.isUndefined(node[NodeProp[prop]])) {
-          const revisedProp = (prop + "_REVISED") as keyof typeof NodeProp
-          const loops = node[NodeProp.ACTUAL_LOOPS] || 1
-          const revised = <number>node[NodeProp[prop]] * loops
-          node[NodeProp[revisedProp] as unknown as keyof typeof Node] = revised
+      (prop: keyof typeof Property) => {
+        if (!_.isUndefined(node[Property[prop]])) {
+          const revisedProp = (prop + "_REVISED") as keyof typeof Property
+          const loops = node[Property.ACTUAL_LOOPS] || 1
+          const revised = <number>node[Property[prop]] * loops
+          node[Property[revisedProp] as unknown as keyof typeof Node] = revised
         }
       },
     )
@@ -284,27 +281,27 @@ export class PlanService {
     // Iterate over the CTEs
     _.each(plan.ctes, (cte) => {
       // Time spent in the CTE itself
-      const cteDuration = cte[NodeProp.ACTUAL_TOTAL_TIME] || 0
+      const cteDuration = cte[Property.ACTUAL_TOTAL_TIME] || 0
 
       // Find all nodes that are "CTE Scan" for the given CTE
       const cteScans = _.filter(
         this.flat,
         (node) =>
-          `CTE ${node[NodeProp.CTE_NAME]}` == cte[NodeProp.SUBPLAN_NAME],
+          `CTE ${node[Property.CTE_NAME]}` == cte[Property.SUBPLAN_NAME],
       )
 
       // Sum of exclusive time for the CTE Scans
       const sumScansDuration = _.sumBy(
         cteScans,
-        (node) => node[NodeProp.EXCLUSIVE_DURATION],
+        (node) => node[Property.EXCLUSIVE_DURATION],
       )
 
       // Subtract exclusive time proportionally
       _.each(cteScans, (node) => {
-        node[NodeProp.EXCLUSIVE_DURATION] = Math.max(
+        node[Property.EXCLUSIVE_DURATION] = Math.max(
           0,
-          node[NodeProp.EXCLUSIVE_DURATION] -
-            (cteDuration * (node[NodeProp.ACTUAL_TOTAL_TIME] || 0)) /
+          node[Property.EXCLUSIVE_DURATION] -
+            (cteDuration * (node[Property.ACTUAL_TOTAL_TIME] || 0)) /
               sumScansDuration,
         )
       })
@@ -320,7 +317,7 @@ export class PlanService {
     // Find all initPlans
     const initPlans = _.filter(
       this.flat,
-      (node) => node[NodeProp.PARENT_RELATIONSHIP] == "InitPlan",
+      (node) => node[Property.PARENT_RELATIONSHIP] == "InitPlan",
     )
 
     _.each(initPlans, (subPlan) => {
@@ -328,11 +325,11 @@ export class PlanService {
       // It can be either:
       //  - InitPlan 2 (returns $1) -> $1
       //  - InitPlan 2 -> InitPlan 2
-      if (!subPlan[NodeProp.SUBPLAN_NAME]) {
+      if (!subPlan[Property.SUBPLAN_NAME]) {
         return
       }
       const matches = /(InitPlan\s+[1-9]+)(?:\s+\(returns (\$[0-9]+)\))*/m.exec(
-        subPlan[NodeProp.SUBPLAN_NAME] as string,
+        subPlan[Property.SUBPLAN_NAME] as string,
       )
       if (!matches) {
         return
@@ -344,7 +341,7 @@ export class PlanService {
       _.each(
         _.filter(
           this.flat,
-          (node) => node[NodeProp.PARENT_RELATIONSHIP] != "InitPlan",
+          (node) => node[Property.PARENT_RELATIONSHIP] != "InitPlan",
         ),
         (node) => {
           _.each(node, (value) => {
@@ -357,8 +354,8 @@ export class PlanService {
               `.*${name.replace(/[^a-zA-Z0-9]/g, "\\$&")}[0-9]?`,
             ).exec(value)
             if (matches) {
-              node[NodeProp.EXCLUSIVE_DURATION] -=
-                subPlan[NodeProp.ACTUAL_TOTAL_TIME] || 0
+              node[Property.EXCLUSIVE_DURATION] -=
+                subPlan[Property.ACTUAL_TOTAL_TIME] || 0
               // Stop iterating for this node
               return false
             }
@@ -370,15 +367,15 @@ export class PlanService {
 
   // function to get the sum of actual durations of a a node children
   public childrenDuration(node: Node, duration: number) {
-    _.each(node[NodeProp.PLANS], (child) => {
+    _.each(node[Property.PLANS], (child) => {
       // Subtract sub plans duration from this node except for InitPlans
       // (ie. CTE)
       if (
-        child[NodeProp.PARENT_RELATIONSHIP] !== "InitPlan" ||
-        (child[NodeProp.PARENT_RELATIONSHIP] == "InitPlan" &&
-          node[NodeProp.NODE_TYPE] == "Result")
+        child[Property.PARENT_RELATIONSHIP] !== "InitPlan" ||
+        (child[Property.PARENT_RELATIONSHIP] == "InitPlan" &&
+          node[Property.NODE_TYPE] == "Result")
       ) {
-        duration += child[NodeProp.ACTUAL_TOTAL_TIME] || 0 // Duration may not be set
+        duration += child[Property.ACTUAL_TOTAL_TIME] || 0 // Duration may not be set
       }
     })
     return duration
@@ -388,20 +385,20 @@ export class PlanService {
   // invloved in this node
   public calculatePlannerEstimate(node: Node) {
     if (
-      node[NodeProp.ACTUAL_ROWS] !== undefined &&
-      node[NodeProp.PLAN_ROWS] !== undefined
+      node[Property.ACTUAL_ROWS] !== undefined &&
+      node[Property.PLAN_ROWS] !== undefined
     ) {
-      node[NodeProp.PLANNER_ESTIMATE_FACTOR] =
-        node[NodeProp.ACTUAL_ROWS] / node[NodeProp.PLAN_ROWS]
-      node[NodeProp.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.none
+      node[Property.PLANNER_ESTIMATE_FACTOR] =
+        node[Property.ACTUAL_ROWS] / node[Property.PLAN_ROWS]
+      node[Property.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.none
 
-      if (node[NodeProp.ACTUAL_ROWS] > node[NodeProp.PLAN_ROWS]) {
-        node[NodeProp.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.under
+      if (node[Property.ACTUAL_ROWS] > node[Property.PLAN_ROWS]) {
+        node[Property.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.under
       }
-      if (node[NodeProp.ACTUAL_ROWS] < node[NodeProp.PLAN_ROWS]) {
-        node[NodeProp.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.over
-        node[NodeProp.PLANNER_ESTIMATE_FACTOR] =
-          node[NodeProp.PLAN_ROWS] / node[NodeProp.ACTUAL_ROWS]
+      if (node[Property.ACTUAL_ROWS] < node[Property.PLAN_ROWS]) {
+        node[Property.PLANNER_ESTIMATE_DIRECTION] = EstimateDirection.over
+        node[Property.PLANNER_ESTIMATE_FACTOR] =
+          node[Property.PLAN_ROWS] / node[Property.ACTUAL_ROWS]
       }
     }
   }
@@ -725,20 +722,20 @@ export class PlanService {
           (nodeMatches[NodeMatch.EstimatedStartupCost2] &&
             nodeMatches[NodeMatch.EstimatedTotalCost2])
         ) {
-          newNode[NodeProp.STARTUP_COST] = parseFloat(
+          newNode[Property.STARTUP_COST] = parseFloat(
             nodeMatches[NodeMatch.EstimatedStartupCost1] ||
               nodeMatches[NodeMatch.EstimatedStartupCost2],
           )
-          newNode[NodeProp.TOTAL_COST] = parseFloat(
+          newNode[Property.TOTAL_COST] = parseFloat(
             nodeMatches[NodeMatch.EstimatedTotalCost1] ||
               nodeMatches[NodeMatch.EstimatedTotalCost2],
           )
-          newNode[NodeProp.PLAN_ROWS] = parseInt(
+          newNode[Property.PLAN_ROWS] = parseInt(
             nodeMatches[NodeMatch.EstimatedRows] ||
               nodeMatches[NodeMatch.EstimatedRows2],
             0,
           )
-          newNode[NodeProp.PLAN_WIDTH] = parseInt(
+          newNode[Property.PLAN_WIDTH] = parseInt(
             nodeMatches[NodeMatch.EstimatedRowWidth] ||
               nodeMatches[NodeMatch.EstimatedRowWidth2],
             0,
@@ -750,11 +747,11 @@ export class PlanService {
           (nodeMatches[NodeMatch.ActualTimeFirst2] &&
             nodeMatches[NodeMatch.ActualTimeLast2])
         ) {
-          newNode[NodeProp.ACTUAL_STARTUP_TIME] = parseFloat(
+          newNode[Property.ACTUAL_STARTUP_TIME] = parseFloat(
             nodeMatches[NodeMatch.ActualTimeFirst1] ||
               nodeMatches[NodeMatch.ActualTimeFirst2],
           )
-          newNode[NodeProp.ACTUAL_TOTAL_TIME] = parseFloat(
+          newNode[Property.ACTUAL_TOTAL_TIME] = parseFloat(
             nodeMatches[NodeMatch.ActualTimeLast1] ||
               nodeMatches[NodeMatch.ActualTimeLast2],
           )
@@ -770,10 +767,10 @@ export class PlanService {
             nodeMatches[NodeMatch.ActualRows1] ||
             nodeMatches[NodeMatch.ActualRows2]
           if (actual_rows.indexOf(".") != -1) {
-            newNode[NodeProp.ACTUAL_ROWS_FRACTIONAL] = true
+            newNode[Property.ACTUAL_ROWS_FRACTIONAL] = true
           }
-          newNode[NodeProp.ACTUAL_ROWS] = parseFloat(actual_rows)
-          newNode[NodeProp.ACTUAL_LOOPS] = parseInt(
+          newNode[Property.ACTUAL_ROWS] = parseFloat(actual_rows)
+          newNode[Property.ACTUAL_LOOPS] = parseInt(
             nodeMatches[NodeMatch.ActualLoops1] ||
               nodeMatches[NodeMatch.ActualLoops2],
             0,
@@ -781,13 +778,13 @@ export class PlanService {
         }
 
         if (nodeMatches[NodeMatch.PartialMode]) {
-          newNode[NodeProp.PARTIAL_MODE] = nodeMatches[NodeMatch.PartialMode]
+          newNode[Property.PARTIAL_MODE] = nodeMatches[NodeMatch.PartialMode]
         }
 
         if (neverExecuted) {
-          newNode[NodeProp.ACTUAL_LOOPS] = 0
-          newNode[NodeProp.ACTUAL_ROWS] = 0
-          newNode[NodeProp.ACTUAL_TOTAL_TIME] = undefined
+          newNode[Property.ACTUAL_LOOPS] = 0
+          newNode[Property.ACTUAL_ROWS] = 0
+          newNode[Property.ACTUAL_TOTAL_TIME] = undefined
         }
         const element = {
           node: newNode,
@@ -815,15 +812,15 @@ export class PlanService {
 
         elementsAtDepth.push([depth, element])
 
-        if (!previousElement.node[NodeProp.PLANS]) {
-          previousElement.node[NodeProp.PLANS] = []
+        if (!previousElement.node[Property.PLANS]) {
+          previousElement.node[Property.PLANS] = []
         }
         if (previousElement.subelementType === "initplan") {
-          newNode[NodeProp.PARENT_RELATIONSHIP] = "InitPlan"
-          newNode[NodeProp.SUBPLAN_NAME] = previousElement.name as string
+          newNode[Property.PARENT_RELATIONSHIP] = "InitPlan"
+          newNode[Property.SUBPLAN_NAME] = previousElement.name as string
         } else if (previousElement.subelementType === "subplan") {
-          newNode[NodeProp.PARENT_RELATIONSHIP] = "SubPlan"
-          newNode[NodeProp.SUBPLAN_NAME] = previousElement.name as string
+          newNode[Property.PARENT_RELATIONSHIP] = "SubPlan"
+          newNode[Property.SUBPLAN_NAME] = previousElement.name as string
         }
         previousElement.node.Plans?.push(newNode)
       } else if (subMatches) {
@@ -857,29 +854,29 @@ export class PlanService {
         if (!previousElement) {
           return
         }
-        if (!previousElement.node[NodeProp.WORKERS]) {
-          previousElement.node[NodeProp.WORKERS] = [] as Worker[]
+        if (!previousElement.node[Property.WORKERS]) {
+          previousElement.node[Property.WORKERS] = [] as Worker[]
         }
         let worker = this.getWorker(previousElement.node, workerNumber)
         if (!worker) {
-          worker = {[WorkerProp.WORKER_NUMBER]: workerNumber}
-          previousElement.node[NodeProp.WORKERS]?.push(worker)
+          worker = {[Property.WORKER_NUMBER]: workerNumber}
+          previousElement.node[Property.WORKERS]?.push(worker)
         }
         if (
           workerMatches[WorkerMatch.ActualTimeFirst] &&
           workerMatches[WorkerMatch.ActualTimeLast]
         ) {
-          worker[NodeProp.ACTUAL_STARTUP_TIME] = parseFloat(
+          worker[Property.ACTUAL_STARTUP_TIME] = parseFloat(
             workerMatches[WorkerMatch.ActualTimeFirst],
           )
-          worker[NodeProp.ACTUAL_TOTAL_TIME] = parseFloat(
+          worker[Property.ACTUAL_TOTAL_TIME] = parseFloat(
             workerMatches[WorkerMatch.ActualTimeLast],
           )
-          worker[NodeProp.ACTUAL_ROWS] = parseInt(
+          worker[Property.ACTUAL_ROWS] = parseInt(
             workerMatches[WorkerMatch.ActualRows],
             0,
           )
-          worker[NodeProp.ACTUAL_LOOPS] = parseInt(
+          worker[Property.ACTUAL_LOOPS] = parseInt(
             workerMatches[WorkerMatch.ActualLoops],
             0,
           )
@@ -922,9 +919,9 @@ export class PlanService {
           if (!lastElement) {
             return
           }
-          if (_.last(lastElement.node?.[NodeProp.WORKERS])) {
+          if (_.last(lastElement.node?.[Property.WORKERS])) {
             const worker: Worker = _.last(
-              lastElement.node?.[NodeProp.WORKERS],
+              lastElement.node?.[Property.WORKERS],
             ) as Worker
             worker.JIT = {} as JIT
             element = {
@@ -1057,9 +1054,9 @@ export class PlanService {
       /^(\s*)Sort Method:\s+(.*)\s+(Memory|Disk):\s+(?:(\S*)kB)\s*$/g
     const sortMatches = sortRegex.exec(text)
     if (sortMatches) {
-      el[NodeProp.SORT_METHOD] = sortMatches[SortMatch.Method].trim()
-      el[NodeProp.SORT_SPACE_USED] = sortMatches[SortMatch.SpaceUsed]
-      el[NodeProp.SORT_SPACE_TYPE] = sortMatches[SortMatch.SpaceType]
+      el[Property.SORT_METHOD] = sortMatches[SortMatch.Method].trim()
+      el[Property.SORT_SPACE_USED] = sortMatches[SortMatch.SpaceUsed]
+      el[Property.SORT_SPACE_TYPE] = sortMatches[SortMatch.SpaceType]
       return true
     }
     return false
@@ -1105,8 +1102,8 @@ export class PlanService {
   }
 
   private getWorker(node: Node, workerNumber: number): Worker | undefined {
-    return _.find(node[NodeProp.WORKERS], (worker) => {
-      return worker[WorkerProp.WORKER_NUMBER] === workerNumber
+    return _.find(node[Property.WORKERS], (worker) => {
+      return worker[Property.WORKER_NUMBER] === workerNumber
     })
   }
 
@@ -1202,30 +1199,30 @@ export class PlanService {
 
     // Initiate with default value
     if (scopeIsDetailed) {
-      el[NodeProp.SHARED_IO_READ_TIME] = 0
-      el[NodeProp.SHARED_IO_WRITE_TIME] = 0
-      el[NodeProp.LOCAL_IO_READ_TIME] = 0
-      el[NodeProp.LOCAL_IO_WRITE_TIME] = 0
+      el[Property.SHARED_IO_READ_TIME] = 0
+      el[Property.SHARED_IO_WRITE_TIME] = 0
+      el[Property.LOCAL_IO_READ_TIME] = 0
+      el[Property.LOCAL_IO_WRITE_TIME] = 0
     } else {
-      el[NodeProp.IO_READ_TIME] = 0
-      el[NodeProp.IO_WRITE_TIME] = 0
+      el[Property.IO_READ_TIME] = 0
+      el[Property.IO_WRITE_TIME] = 0
     }
     if (scopeIsPartiallyDetailed || scopeIsDetailed) {
-      el[NodeProp.TEMP_IO_READ_TIME] = 0
-      el[NodeProp.TEMP_IO_WRITE_TIME] = 0
+      el[Property.TEMP_IO_READ_TIME] = 0
+      el[Property.TEMP_IO_WRITE_TIME] = 0
     }
 
     results.forEach((result) => {
       ;["read", "write"].forEach((operation) => {
-        let prop = `IO_${_.upperCase(operation)}_TIME` as keyof typeof NodeProp
+        let prop = `IO_${_.upperCase(operation)}_TIME` as keyof typeof Property
 
         if (result.scope && result.scope != "shared/local") {
           prop = (_.upperCase(result.scope) +
             "_" +
-            prop) as keyof typeof NodeProp
+            prop) as keyof typeof Property
         }
-        const nodeProp = NodeProp[prop] as unknown as keyof typeof Node
-        el[nodeProp] = result[operation as "read" | "write"]
+        const property = Property[prop] as unknown as keyof typeof Node
+        el[property] = result[operation as "read" | "write"]
       })
     })
 
@@ -1320,24 +1317,24 @@ export class PlanService {
 
     if (matches) {
       const groups: SortGroups = {
-        [SortGroupsProp.GROUP_COUNT]: parseInt(matches[2], 0),
-        [SortGroupsProp.SORT_METHODS_USED]: _.map(
+        [Property.GROUP_COUNT]: parseInt(matches[2], 0),
+        [Property.SORT_METHODS_USED]: _.map(
           matches[3].split(","),
           _.trim,
         ),
-        [SortGroupsProp.SORT_SPACE_MEMORY]: {
-          [SortSpaceMemoryProp.AVERAGE_SORT_SPACE_USED]: parseInt(
+        [Property.SORT_SPACE_MEMORY]: {
+          [Property.AVERAGE_SORT_SPACE_USED]: parseInt(
             matches[4],
             0,
           ),
-          [SortSpaceMemoryProp.PEAK_SORT_SPACE_USED]: parseInt(matches[5], 0),
+          [Property.PEAK_SORT_SPACE_USED]: parseInt(matches[5], 0),
         },
       }
 
       if (matches[1] === "Full-sort") {
-        el[NodeProp.FULL_SORT_GROUPS] = groups
+        el[Property.FULL_SORT_GROUPS] = groups
       } else if (matches[1] === "Pre-sorted") {
-        el[NodeProp.PRE_SORTED_GROUPS] = groups
+        el[Property.PRE_SORTED_GROUPS] = groups
       } else {
         throw new Error("Unsupported sort groups method")
       }
@@ -1352,7 +1349,7 @@ export class PlanService {
     const matches = booleanRegex.test(text)
 
     if (matches) {
-      el[NodeProp.DISABLED] = true;
+      el[Property.DISABLED] = true;
       return true
     }
     return false
@@ -1360,7 +1357,7 @@ export class PlanService {
 
   private calculateExclusives(node: Node) {
     // Caculate inclusive value for the current node for the given property
-    const properties: Array<keyof typeof NodeProp> = [
+    const properties: Array<keyof typeof Property> = [
       "SHARED_HIT_BLOCKS",
       "SHARED_READ_BLOCKS",
       "SHARED_DIRTIED_BLOCKS",
@@ -1380,26 +1377,25 @@ export class PlanService {
       "TEMP_IO_READ_TIME",
       "TEMP_IO_WRITE_TIME",
     ]
-    _.each(properties, (property) => {
+    _.each(properties, (p) => {
       const sum = Number(
         _.sumBy(
           // Don't take subplans into account (InitPlan)
           _.filter(
-            node[NodeProp.PLANS],
-            (child: Node) => !child[NodeProp.SUBPLAN_NAME],
+            node[Property.PLANS],
+            (child: Node) => !child[Property.SUBPLAN_NAME],
           ),
           (child: Node) => {
-            return (child[NodeProp[property]] as number) || 0
+            return (child[Property[p]] as number) || 0
           },
         ).toFixed(3),
       )
-      const exclusivePropertyString = ("EXCLUSIVE_" +
-        property) as keyof typeof NodeProp
-      const nodeProp = NodeProp[
+      const exclusivePropertyString = ("EXCLUSIVE_" + p) as keyof typeof Property
+      const property = Property[
         exclusivePropertyString
       ] as unknown as keyof typeof Node
-      node[nodeProp] = Number(
-        ((node[NodeProp[property]] as number) - sum).toFixed(3),
+      node[property] = Number(
+        ((node[Property[p]] as number) - sum).toFixed(3),
       )
     })
   }
@@ -1407,12 +1403,12 @@ export class PlanService {
   private calculateIoTimingsAverage(node: Node) {
     // The matrix to match I/O Timings with Buffers
     let scopesMatrix
-    if (_.isUndefined(node[NodeProp.TEMP_IO_READ_TIME])) {
+    if (_.isUndefined(node[Property.TEMP_IO_READ_TIME])) {
       // pre Pg15
       scopesMatrix = {
         "": ["shared", "local", "temp"],
       }
-    } else if (!_.isUndefined(node[NodeProp.IO_READ_TIME])) {
+    } else if (!_.isUndefined(node[Property.IO_READ_TIME])) {
       // pg15-16
       scopesMatrix = {
         "": ["shared", "local"],
@@ -1433,20 +1429,20 @@ export class PlanService {
       operations.forEach((operation, index) => {
         ;["exclusive_", ""].forEach((prefix) => {
           const timeProp =
-            `${prefix}${timingScope ? timingScope + "_" : ""}io_${operation}_time`.toUpperCase() as keyof typeof NodeProp
+            `${prefix}${timingScope ? timingScope + "_" : ""}io_${operation}_time`.toUpperCase() as keyof typeof Property
           const speedProp =
-            `${prefix}average_${timingScope ? timingScope + "_" : ""}io_${operation}_speed`.toUpperCase() as keyof typeof NodeProp
-          const time = (node[NodeProp[timeProp]] as number) || 0
+            `${prefix}average_${timingScope ? timingScope + "_" : ""}io_${operation}_speed`.toUpperCase() as keyof typeof Property
+          const time = (node[Property[timeProp]] as number) || 0
           const buffersOperation = buffersOperations[index]
           const buffers = _.sumBy(buffersScopes, (bufferScope) => {
             const bufferProp =
-              `${prefix}${bufferScope}_${buffersOperation}_blocks`.toUpperCase() as keyof typeof NodeProp
-            return (node[NodeProp[bufferProp]] as number) || 0
+              `${prefix}${bufferScope}_${buffersOperation}_blocks`.toUpperCase() as keyof typeof Property
+            return (node[Property[bufferProp]] as number) || 0
           })
-          const buffersProp = `${prefix}${buffersOperation}_blocks`.toUpperCase() as keyof typeof NodeProp;
-          node[NodeProp[buffersProp] as unknown as keyof typeof Node] = buffers;
+          const buffersProp = `${prefix}${buffersOperation}_blocks`.toUpperCase() as keyof typeof Property;
+          node[Property[buffersProp] as unknown as keyof typeof Node] = buffers;
           if (time) {
-            node[NodeProp[speedProp] as unknown as keyof typeof Node] = Number(
+            node[Property[speedProp] as unknown as keyof typeof Node] = Number(
               (buffers / (time / 1000)).toFixed(3),
             )
           }
@@ -1458,27 +1454,27 @@ export class PlanService {
     operations.forEach((operation, index) => {
       ;["exclusive_", ""].forEach((prefix) => {
         const sumTimeProp =
-          `${prefix}sum_io_${operation}_time`.toUpperCase() as keyof typeof NodeProp
+          `${prefix}sum_io_${operation}_time`.toUpperCase() as keyof typeof Property
         const speedProp =
-          `${prefix}average_sum_io_${operation}_speed`.toUpperCase() as keyof typeof NodeProp
+          `${prefix}average_sum_io_${operation}_speed`.toUpperCase() as keyof typeof Property
         let time = 0
         let buffers = 0
         _.forEach(scopesMatrix, (buffersScopes, timingScope) => {
           const timeProp =
-            `${prefix}${timingScope ? timingScope + "_" : ""}io_${operation}_time`.toUpperCase() as keyof typeof NodeProp
-          time += (node[NodeProp[timeProp]] as number) || 0
+            `${prefix}${timingScope ? timingScope + "_" : ""}io_${operation}_time`.toUpperCase() as keyof typeof Property
+          time += (node[Property[timeProp]] as number) || 0
           const buffersOperation = buffersOperations[index]
           buffers += _.sumBy(buffersScopes, (bufferScope) => {
             const bufferProp =
-              `${prefix}${bufferScope}_${buffersOperation}_blocks`.toUpperCase() as keyof typeof NodeProp
-            return (node[NodeProp[bufferProp]] as number) || 0
+              `${prefix}${bufferScope}_${buffersOperation}_blocks`.toUpperCase() as keyof typeof Property
+            return (node[Property[bufferProp]] as number) || 0
           })
         })
-        node[NodeProp[sumTimeProp] as unknown as keyof typeof Node] = Number(
+        node[Property[sumTimeProp] as unknown as keyof typeof Node] = Number(
           time.toFixed(3),
         )
         if (time) {
-          node[NodeProp[speedProp] as unknown as keyof typeof Node] = Number(
+          node[Property[speedProp] as unknown as keyof typeof Node] = Number(
             (buffers / (time / 1000)).toFixed(3),
           )
         }
@@ -1493,15 +1489,15 @@ export class PlanService {
       return false
     }
     return _.some(children, (child) => {
-      return _.has(child, NodeProp.OUTPUT) || this.findOutputProperty(child)
+      return _.has(child, Property.OUTPUT) || this.findOutputProperty(child)
     })
   }
 
   private convertNodeType(node: Node): void {
     // Convert some node type (possibly from JSON source) to match the TEXT format
-    if (node[NodeProp.NODE_TYPE] == "Aggregate" && node[NodeProp.STRATEGY]) {
+    if (node[Property.NODE_TYPE] == "Aggregate" && node[Property.STRATEGY]) {
       let prefix = ""
-      switch (node[NodeProp.STRATEGY]) {
+      switch (node[Property.STRATEGY]) {
         case "Sorted":
           prefix = "Group"
           break
@@ -1514,11 +1510,11 @@ export class PlanService {
         default:
           console.error("Unsupported Aggregate Strategy")
       }
-      node[NodeProp.NODE_TYPE] = prefix + "Aggregate"
+      node[Property.NODE_TYPE] = prefix + "Aggregate"
     }
 
-    if (node[NodeProp.NODE_TYPE] == "ModifyTable") {
-      node[NodeProp.NODE_TYPE] = node[NodeProp.OPERATION] as string
+    if (node[Property.NODE_TYPE] == "ModifyTable") {
+      node[Property.NODE_TYPE] = node[Property.OPERATION] as string
     }
   }
 }