diff --git a/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.html b/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.html
index 985c72c443..e2bc21f852 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/diagram-sequence-flow.component.html
@@ -1 +1,2 @@
-<raphael-flow-arrow [flow]="flow"></raphael-flow-arrow>
\ No newline at end of file
+<raphael-flow-arrow [flow]="flow"></raphael-flow-arrow>
+<diagram-tooltip [data]="flow"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.html b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.html
index 6550ba6dca..16839c2fba 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/gateways/diagram-gateway.component.html
@@ -1,2 +1,3 @@
 <raphael-rhombus [center]="center" [width]="width" [height]="height" [stroke]="options.stroke" [strokeWidth]="options.strokeWidth"
-                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rhombus>
\ No newline at end of file
+                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rhombus>
+<diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/index.ts b/ng2-components/ng2-activiti-diagrams/src/components/index.ts
index 934cc0f7d2..68ca24bf0d 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/index.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/index.ts
@@ -40,7 +40,6 @@ export * from './boundary-events/index';
 export * from './intermediate-catching-events/index';
 export * from './structural/index';
 export * from './swimlanes/index';
-export * from '../models/diagram-metric.model';
 
 export const DIAGRAM_DIRECTIVES: any[] = [
     DiagramComponent,
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.html b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.html
index b5eb151f55..696bc784d8 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/intermediate-catching-events/diagram-intermediate-catching-event.component.html
@@ -2,4 +2,5 @@
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
 <raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
-<diagram-container-icon-event [data]="data" [type]="data.eventDefinition.type"></diagram-container-icon-event>
\ No newline at end of file
+<diagram-container-icon-event [data]="data" [type]="data.eventDefinition.type"></diagram-container-icon-event>
+<diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts
index 3cf8ae5cb3..4eee171c9c 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-flow-arrow.component.ts
@@ -54,7 +54,7 @@ export class RaphaelFlowArrowDirective extends RaphaelBase implements OnInit {
         polyline.element.attr({'stroke-width': this.SEQUENCEFLOW_STROKE});
         polyline.element.attr({'stroke': '#585858'});
 
-        polyline.element.id = this.flow.id;
+        polyline.element.node.id = this.flow.id;
 
         let lastLineIndex = polyline.getLinesCount() - 1;
         let line = polyline.getLine(lastLineIndex);
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.html b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.html
index a3b195375b..35f293f7fb 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-event-subprocess.component.html
@@ -1,3 +1,4 @@
 <raphael-rect [leftCorner]="rectLeftCorner" [width]="width" [height]="height" [radius]="options.radius"
               [stroke]="options.stroke" [strokeWidth]="options.strokeWidth"
-              [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rect>
\ No newline at end of file
+              [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rect>
+<diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.html b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.html
index a3b195375b..35f293f7fb 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/structural/diagram-subprocess.component.html
@@ -1,3 +1,4 @@
 <raphael-rect [leftCorner]="rectLeftCorner" [width]="width" [height]="height" [radius]="options.radius"
               [stroke]="options.stroke" [strokeWidth]="options.strokeWidth"
-              [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rect>
\ No newline at end of file
+              [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rect>
+<diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/models/diagram-metric.model.ts b/ng2-components/ng2-activiti-diagrams/src/models/diagram-metric.model.ts
deleted file mode 100644
index c376485aa7..0000000000
--- a/ng2-components/ng2-activiti-diagrams/src/models/diagram-metric.model.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export class DiagramMetricModel {
-    colorDiagramMap: string;
-    valueDiagramMap: string;
-    dataType: string;
-
-    constructor(obj?: any) {
-        if (obj) {
-            this.colorDiagramMap = obj.colorDiagramMap || '';
-            this.valueDiagramMap = obj.valueDiagramMap || '';
-            this.dataType = obj.dataType || '';
-        }
-    }
-}