diff --git a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.html b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.html
index 31037bfd34..648231ffcd 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-boundary-event.component.html
@@ -1,6 +1,6 @@
 <raphael-circle [center]="center" [radius]="circleRadiusInner" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
-<raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
+<raphael-circle [elementId]="data.id" [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" [fillColor]="signalFillColor"></diagram-container-icon-event>
 <diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.html b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.html
index 61486f216f..c3d32453f3 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.html
+++ b/ng2-components/ng2-activiti-diagrams/src/components/boundary-events/diagram-throw-event.component.html
@@ -1,6 +1,6 @@
 <raphael-circle [center]="center" [radius]="circleRadiusInner" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
-<raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
+<raphael-circle [elementId]="data.id" [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 && data.eventDefinition.type"
                               [fillColor]="signalFillColor"></diagram-container-icon-event>
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 16839c2fba..675fd3d428 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,3 +1,3 @@
-<raphael-rhombus [center]="center" [width]="width" [height]="height" [stroke]="options.stroke" [strokeWidth]="options.strokeWidth"
+<raphael-rhombus [elementId]="data.id" [center]="center" [width]="width" [height]="height" [stroke]="options.stroke" [strokeWidth]="options.strokeWidth"
                  [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-rhombus>
 <diagram-tooltip [data]="data"></diagram-tooltip>
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 696bc784d8..d1717ccfab 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
@@ -1,6 +1,6 @@
 <raphael-circle [center]="center" [radius]="circleRadiusInner" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
                 [fillColors]="options.fillColors" [fillOpacity]="options.fillOpacity"></raphael-circle>
-<raphael-circle [center]="center" [radius]="circleRadiusOuter" [strokeWidth]="options.strokeWidth" [stroke]="options.stroke"
+<raphael-circle [elementId]="data.id" [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>
 <diagram-tooltip [data]="data"></diagram-tooltip>
diff --git a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts
index 08e2d7d3fd..d55ef0ba12 100644
--- a/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/components/raphael/raphael-rhombus.component.ts
@@ -43,6 +43,9 @@ export class RaphaelRhombusDirective extends RaphaelBase implements OnInit {
     @Input()
     fillOpacity: any;
 
+    @Input()
+    elementId: string;
+
     @Output()
     onError = new EventEmitter();
 
@@ -54,11 +57,12 @@ export class RaphaelRhombusDirective extends RaphaelBase implements OnInit {
     ngOnInit() {
         console.log(this.elementRef);
         let opts = {'stroke-width': this.strokeWidth, 'fill': this.fillColors, 'stroke': this.stroke, 'fill-opacity': this.fillOpacity};
-        this.draw(this.center, this.width, this.height, opts);
+        let elementDraw = this.draw(this.center, this.width, this.height, opts);
+        elementDraw.node.id = this.elementId;
     }
 
     public draw(center: Point, width: number, height: number, opts?: any) {
-        this.paper.path('M' + center.x + ' ' + (center.y + (height / 2)) +
+        return this.paper.path('M' + center.x + ' ' + (center.y + (height / 2)) +
             'L' + (center.x + (width / 2)) + ' ' + (center.y + height) +
             'L' + (center.x + width) + ' ' + (center.y + (height / 2)) +
             'L' + (center.x + (width / 2)) + ' ' + center.y + 'z'
diff --git a/ng2-components/ng2-activiti-diagrams/src/models/diagram.model.ts b/ng2-components/ng2-activiti-diagrams/src/models/diagram.model.ts
index 8507ba48e9..f001ef4e22 100644
--- a/ng2-components/ng2-activiti-diagrams/src/models/diagram.model.ts
+++ b/ng2-components/ng2-activiti-diagrams/src/models/diagram.model.ts
@@ -54,6 +54,7 @@ export class DiagramElementModel {
     y: string;
     properties: DiagramElementPropertyModel[] = [];
     dataType: string = '';
+    eventDefinition: DiagramEventDefinitionModel;
 
     constructor(obj?: any) {
         if (obj) {
@@ -71,6 +72,9 @@ export class DiagramElementModel {
                 });
             }
             this.dataType = obj.dataType || '';
+            if (obj.eventDefinition) {
+                this.eventDefinition = new DiagramEventDefinitionModel(obj.eventDefinition);
+            }
         }
     }
 }
@@ -124,3 +128,15 @@ export class DiagramWayPointModel {
         }
     }
 }
+
+export class DiagramEventDefinitionModel {
+    timeCycle: string;
+    type: string;
+
+    constructor(obj?: any) {
+        if (obj) {
+            this.timeCycle = obj.timeCycle;
+            this.type = obj.type;
+        }
+    }
+}