diff --git a/packages/mermaid/src/rendering-util/rendering-elements/edges.js b/packages/mermaid/src/rendering-util/rendering-elements/edges.js
index ad1573596..ebb7f3e69 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/edges.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/edges.js
@@ -622,6 +622,11 @@ export const insertEdge = function (elem, edge, clusterDb, diagramType, graph, i
       .attr('class', ' ' + strokeClasses + (edge.classes ? ' ' + edge.classes : ''))
       .attr('style', edge.style);
   }
+
+  // MC Special
+  svgPath.attr('data-edge', true);
+  svgPath.attr('data-et', 'edge');
+  svgPath.attr('data-id', edge.id);
   // DEBUG code, adds a red circle at each edge coordinate
   // cornerPoints.forEach((point) => {
   //   elem
diff --git a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
index d03fd257a..99791a167 100644
--- a/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/nodes.js
@@ -57,9 +57,6 @@ export const insertNode = async (elem, node, dir) => {
   let newEl;
   let el;
 
-  if (node) {
-    console.log('BLA: rect node', JSON.stringify(node));
-  }
   //special check for rect shape (with or without rounded corners)
   if (node.shape === 'rect') {
     if (node.rx && node.ry) {
@@ -83,6 +80,10 @@ export const insertNode = async (elem, node, dir) => {
     el = await shapes[node.shape](elem, node, dir);
     newEl = el;
   }
+  // MC Special
+  newEl.attr('data-id', node.id);
+  newEl.attr('data-node', true);
+  newEl.attr('data-et', 'node');
   if (node.tooltip) {
     el.attr('title', node.tooltip);
   }