diff --git a/include/bpe.hrl b/include/bpe.hrl
index daea007..50eae48 100644
--- a/include/bpe.hrl
+++ b/include/bpe.hrl
@@ -70,7 +70,7 @@
 -type events() :: #messageEvent{} | #boundaryEvent{} | #timeoutEvent{}.
 -type procId() :: [] | integer() | {atom(),any()}.
 
--record(process,      { id = [] :: [] | integer() | {atom(),any()}, % procId
+-record(process,      { id = [] :: procId(),
                         container=feed :: [] | atom(),
                         feed_id=[] :: [] | atom() | term(),
                         prev=[] :: [] | integer(),
@@ -78,8 +78,8 @@
                         name=[] :: [] | binary() | string() | atom(),
                         feeds=[] :: list(),
                         roles      = [] :: list(),
-                        tasks      = [] :: list(#task{} | #serviceTask{} | #userTask{} | #receiveTask{} | #beginEvent{} | #endEvent{}), % tasks
-                        events     = [] :: list(#messageEvent{} | #boundaryEvent{} | #timeoutEvent{}), % events
+                        tasks      = [] :: list(tasks()),
+                        events     = [] :: list(events()),
                         hist       = [] :: [] | term(),
                         flows      = [] :: list(#sequenceFlow{}),
                         rules      = [] :: [] | term(),