diff --git a/doc/class-diagram.dia b/doc/class-diagram.dia
index b355e80a..3e68df3d 100644
--- a/doc/class-diagram.dia
+++ b/doc/class-diagram.dia
@@ -2989,8 +2989,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.55,48.5503"/>
-        <dia:point val="32.55,53.9249"/>
-        <dia:point val="29.015,53.9249"/>
+        <dia:point val="32.55,53.5249"/>
+        <dia:point val="29.015,53.5249"/>
         <dia:point val="29.015,58.4996"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -3171,13 +3171,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="45.95,-24.35"/>
+        <dia:point val="46.7,-27.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="45.9,-24.4;69.215,-2.5"/>
+        <dia:rectangle val="46.65,-27.75;69.965,-5.85"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="45.95,-24.35"/>
+        <dia:point val="46.7,-27.7"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="23.215"/>
@@ -4205,19 +4205,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="76.7,-14.95"/>
+        <dia:point val="76,-18.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="76.65,-15;93.42,-1.9"/>
+        <dia:rectangle val="75.95,-18.45;92.72,-2.95"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="76.7,-14.95"/>
+        <dia:point val="76,-18.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="16.670000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="13"/>
+        <dia:real val="15.4"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#BaseEvent#</dia:string>
@@ -4730,6 +4730,96 @@
           </dia:attribute>
           <dia:attribute name="parameters"/>
         </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#onEventAddition#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#onEventDeletion#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#void#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#onEventTrigger#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#void#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="0"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="parameters"/>
+        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -4774,18 +4864,18 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
-        <dia:point val="69.165,-20.05"/>
+        <dia:point val="69.915,-23.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="68.415,-20.85;85.62,-14.15"/>
+        <dia:rectangle val="69.165,-24.2;84.92,-17.6"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="69.165,-20.05"/>
-        <dia:point val="85.035,-20.05"/>
-        <dia:point val="85.035,-14.95"/>
+        <dia:point val="69.915,-23.4"/>
+        <dia:point val="84.335,-23.4"/>
+        <dia:point val="84.335,-18.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -5394,8 +5484,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="49.6225,6.8"/>
-        <dia:point val="49.6225,2.05"/>
-        <dia:point val="38.3475,2.05"/>
+        <dia:point val="49.6225,2.45"/>
+        <dia:point val="38.3475,2.45"/>
         <dia:point val="38.3475,-1.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -5545,8 +5635,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="49.6225,6.8"/>
-        <dia:point val="49.6225,2.8675"/>
-        <dia:point val="55.055,2.8675"/>
+        <dia:point val="49.6225,3.2675"/>
+        <dia:point val="55.055,3.2675"/>
         <dia:point val="55.055,-0.265"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6127,8 +6217,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.38,6.55"/>
-        <dia:point val="-3.38,4.8675"/>
-        <dia:point val="-3.35,4.8675"/>
+        <dia:point val="-3.38,5.2175"/>
+        <dia:point val="-3.35,5.2175"/>
         <dia:point val="-3.35,3.885"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6272,8 +6362,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.35,1.085"/>
-        <dia:point val="-3.35,-1.7975"/>
-        <dia:point val="-3.415,-1.7975"/>
+        <dia:point val="-3.35,-1.3975"/>
+        <dia:point val="-3.415,-1.3975"/>
         <dia:point val="-3.415,-3.88"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6844,15 +6934,15 @@
         <dia:point val="32.25,-3.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.0501,-7.08;46.1651,-2.6"/>
+        <dia:rectangle val="28.0501,-7.08;45.7901,-2.6"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.25,-3.4"/>
-        <dia:point val="30.55,-3.4"/>
-        <dia:point val="30.55,-6.28"/>
+        <dia:point val="30.175,-3.4"/>
+        <dia:point val="30.175,-6.28"/>
         <dia:point val="28.1001,-6.28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6922,8 +7012,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="2.34,-5.38"/>
-        <dia:point val="7.6838,-5.38"/>
-        <dia:point val="7.6838,-6.28"/>
+        <dia:point val="8.0588,-5.38"/>
+        <dia:point val="8.0588,-6.28"/>
         <dia:point val="13.7776,-6.28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -7611,8 +7701,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2301,22.85"/>
-        <dia:point val="1.2301,21.175"/>
-        <dia:point val="8.2251,21.175"/>
+        <dia:point val="1.2301,21.525"/>
+        <dia:point val="8.2251,21.525"/>
         <dia:point val="8.2251,20.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -7860,8 +7950,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2301,27.85"/>
-        <dia:point val="1.2301,29.7075"/>
-        <dia:point val="1.2201,29.7075"/>
+        <dia:point val="1.2301,29.3575"/>
+        <dia:point val="1.2201,29.3575"/>
         <dia:point val="1.2201,30.865"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -8447,8 +8537,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2201,33.665"/>
-        <dia:point val="1.2201,35.29"/>
-        <dia:point val="1.2476,35.29"/>
+        <dia:point val="1.2201,34.94"/>
+        <dia:point val="1.2476,34.94"/>
         <dia:point val="1.2476,36.215"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -8844,8 +8934,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="15.4176,4.8879"/>
-        <dia:point val="15.4176,2.7004"/>
-        <dia:point val="10.9926,2.7004"/>
+        <dia:point val="15.4176,3.1004"/>
+        <dia:point val="10.9926,3.1004"/>
         <dia:point val="10.9926,1.3129"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11401,8 +11491,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="73.3804,26.6153"/>
-        <dia:point val="73.3804,28.99"/>
-        <dia:point val="70.4279,28.99"/>
+        <dia:point val="73.3804,28.59"/>
+        <dia:point val="70.4279,28.59"/>
         <dia:point val="70.4279,30.5647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11552,8 +11642,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="73.3804,26.6153"/>
-        <dia:point val="73.3804,28.99"/>
-        <dia:point val="75.4429,28.99"/>
+        <dia:point val="73.3804,28.59"/>
+        <dia:point val="75.4429,28.59"/>
         <dia:point val="75.4429,30.5647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11703,8 +11793,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="3.9125,57.7403"/>
-        <dia:point val="3.9125,60.1275"/>
-        <dia:point val="3.91129,60.1275"/>
+        <dia:point val="3.9125,59.7275"/>
+        <dia:point val="3.91129,59.7275"/>
         <dia:point val="3.91129,61.7147"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11744,8 +11834,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="62.8825,23.3625"/>
-        <dia:point val="65.205,23.3625"/>
-        <dia:point val="65.205,24.465"/>
+        <dia:point val="64.805,23.3625"/>
+        <dia:point val="64.805,24.465"/>
         <dia:point val="66.7275,24.465"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -12063,13 +12153,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O57">
       <dia:attribute name="obj_pos">
-        <dia:point val="128.303,4.74"/>
+        <dia:point val="139.603,-0.31"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="128.253,4.69;136.938,8.99"/>
+        <dia:rectangle val="139.553,-0.36;148.238,3.94"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="128.303,4.74"/>
+        <dia:point val="139.603,-0.31"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="8.5850000000000009"/>
@@ -12276,13 +12366,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O58">
       <dia:attribute name="obj_pos">
-        <dia:point val="120.853,4.54"/>
+        <dia:point val="132.003,0.69"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="120.803,4.49;125.933,6.79"/>
+        <dia:rectangle val="131.953,0.64;137.083,2.94"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="120.853,4.54"/>
+        <dia:point val="132.003,0.69"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="5.0300000000000002"/>
@@ -12386,19 +12476,19 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O59">
       <dia:attribute name="obj_pos">
-        <dia:point val="126.435,-2.12225"/>
+        <dia:point val="138.085,-8.72225"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="123.318,-2.17225;127.285,4.53972"/>
+        <dia:rectangle val="134.468,-8.77225;138.935,0.689719"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="126.435,-2.12225"/>
-        <dia:point val="126.435,1.58374"/>
-        <dia:point val="123.368,1.58374"/>
-        <dia:point val="123.368,4.48972"/>
+        <dia:point val="138.085,-8.72225"/>
+        <dia:point val="138.085,-4.04126"/>
+        <dia:point val="134.518,-4.04126"/>
+        <dia:point val="134.518,0.639719"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -12427,19 +12517,19 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O60">
       <dia:attribute name="obj_pos">
-        <dia:point val="126.435,-2.12225"/>
+        <dia:point val="138.085,-8.72225"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="125.585,-2.17225;132.645,4.73974"/>
+        <dia:rectangle val="137.236,-8.77225;143.946,-0.310262"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="126.435,-2.12225"/>
-        <dia:point val="126.435,1.68375"/>
-        <dia:point val="132.595,1.68375"/>
-        <dia:point val="132.595,4.68974"/>
+        <dia:point val="138.085,-8.72225"/>
+        <dia:point val="138.085,-4.54125"/>
+        <dia:point val="143.895,-4.54125"/>
+        <dia:point val="143.895,-0.360262"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
@@ -13724,8 +13814,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.4726,2.83475"/>
-        <dia:point val="32.4726,-0.597627"/>
-        <dia:point val="28.1001,-0.597627"/>
+        <dia:point val="32.4726,-0.972627"/>
+        <dia:point val="28.1001,-0.972627"/>
         <dia:point val="28.1001,-4.78"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -13960,8 +14050,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="74.3979,71.14"/>
-        <dia:point val="77.7612,71.14"/>
-        <dia:point val="77.7612,71.565"/>
+        <dia:point val="77.3612,71.14"/>
+        <dia:point val="77.3612,71.565"/>
         <dia:point val="80.3246,71.565"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -15439,13 +15529,13 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O69">
       <dia:attribute name="obj_pos">
-        <dia:point val="117.523,-10.3725"/>
+        <dia:point val="129.173,-16.9725"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="117.473,-10.4225;135.398,-2.1225"/>
+        <dia:rectangle val="129.123,-17.0225;147.048,-8.7225"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="117.523,-10.3725"/>
+        <dia:point val="129.173,-16.9725"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="17.824999999999999"/>
@@ -15849,19 +15939,19 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O70">
       <dia:attribute name="obj_pos">
-        <dia:point val="93.37,-8.85"/>
+        <dia:point val="92.67,-12.3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="93.32,-10.4225;117.573,-8"/>
+        <dia:rectangle val="92.62,-17.0225;129.223,-11.45"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="93.37,-8.85"/>
-        <dia:point val="105.846,-8.85"/>
-        <dia:point val="105.846,-10.3725"/>
-        <dia:point val="117.523,-10.3725"/>
+        <dia:point val="92.67,-12.3"/>
+        <dia:point val="110.922,-12.3"/>
+        <dia:point val="110.922,-16.9725"/>
+        <dia:point val="129.173,-16.9725"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -15890,18 +15980,18 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O71">
       <dia:attribute name="obj_pos">
-        <dia:point val="85.035,-1.95"/>
+        <dia:point val="84.335,-3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="71.9307,-2;85.885,1.33953"/>
+        <dia:rectangle val="71.9307,-3.05;85.185,1.33953"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="85.035,-1.95"/>
-        <dia:point val="85.035,0.0697635"/>
-        <dia:point val="71.9807,0.0697635"/>
+        <dia:point val="84.335,-3"/>
+        <dia:point val="84.335,-0.855237"/>
+        <dia:point val="71.9807,-0.855237"/>
         <dia:point val="71.9807,1.28953"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -16154,19 +16244,21 @@
         <dia:point val="71.9807,16.7905"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="69.779,16.7405;72.8307,20.915"/>
+        <dia:rectangle val="65.976,16.7405;72.8307,19.0147"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="71.9807,16.7905"/>
-        <dia:point val="71.9807,20.115"/>
-        <dia:point val="69.829,20.115"/>
+        <dia:point val="71.9807,17.8776"/>
+        <dia:point val="66.026,17.8776"/>
+        <dia:point val="66.026,18.9647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="1"/>
         <dia:enum val="0"/>
+        <dia:enum val="1"/>
       </dia:attribute>
       <dia:attribute name="orth_autoroute">
         <dia:boolean val="true"/>
@@ -16200,8 +16292,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="71.9807,16.7905"/>
-        <dia:point val="71.9807,18.3776"/>
-        <dia:point val="80.5222,18.3776"/>
+        <dia:point val="71.9807,17.9776"/>
+        <dia:point val="80.5222,17.9776"/>
         <dia:point val="80.5222,19.1647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -16859,17 +16951,17 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O78">
       <dia:attribute name="obj_pos">
-        <dia:point val="85.035,-1.95"/>
+        <dia:point val="84.335,-3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="84.185,-2;95.7676,2.1648"/>
+        <dia:rectangle val="83.485,-3.05;95.7676,2.1648"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="85.035,-1.95"/>
-        <dia:point val="85.035,0.025"/>
+        <dia:point val="84.335,-3"/>
+        <dia:point val="84.335,0.025"/>
         <dia:point val="95.7176,0.025"/>
         <dia:point val="95.7176,2.1148"/>
       </dia:attribute>
@@ -16900,17 +16992,17 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O79">
       <dia:attribute name="obj_pos">
-        <dia:point val="85.035,-1.95"/>
+        <dia:point val="84.335,-3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="84.185,-2;112.673,2.16632"/>
+        <dia:rectangle val="83.485,-3.05;112.673,2.16632"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="85.035,-1.95"/>
-        <dia:point val="85.035,0.05"/>
+        <dia:point val="84.335,-3"/>
+        <dia:point val="84.335,0.05"/>
         <dia:point val="112.623,0.05"/>
         <dia:point val="112.623,2.11632"/>
       </dia:attribute>
@@ -16941,22 +17033,22 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O80">
       <dia:attribute name="obj_pos">
-        <dia:point val="99.9527,-8.235"/>
+        <dia:point val="96.1027,-7.035"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="99.9027,-8.285;112.053,-0.785"/>
+        <dia:rectangle val="96.0527,-7.085;108.203,-1.185"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="99.9527,-8.235"/>
+        <dia:point val="96.1027,-7.035"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="12.050000000000001"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="7.4000000000000004"/>
+        <dia:real val="5.8000000000000007"/>
       </dia:attribute>
       <dia:attribute name="name">
-        <dia:string>#TimerEvent#</dia:string>
+        <dia:string>#GenericTimerEvent#</dia:string>
       </dia:attribute>
       <dia:attribute name="stereotype">
         <dia:string>##</dia:string>
@@ -17089,29 +17181,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#m_Once#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="value">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="1"/>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="operations">
         <dia:composite type="umloperation">
@@ -17222,36 +17291,6 @@
           </dia:attribute>
           <dia:attribute name="parameters"/>
         </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getOnceFlag#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#bool#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="visibility">
-            <dia:enum val="0"/>
-          </dia:attribute>
-          <dia:attribute name="comment">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="abstract">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="inheritance_type">
-            <dia:enum val="2"/>
-          </dia:attribute>
-          <dia:attribute name="query">
-            <dia:boolean val="true"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -17260,19 +17299,19 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O81">
       <dia:attribute name="obj_pos">
-        <dia:point val="93.4203,-8.45"/>
+        <dia:point val="92.7203,-10.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="93.3703,-9.3;99.9523,-4.485"/>
+        <dia:rectangle val="92.6703,-11.55;96.1023,-4.085"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="93.4203,-8.45"/>
-        <dia:point val="97.0613,-8.45"/>
-        <dia:point val="97.0613,-4.535"/>
-        <dia:point val="99.9023,-4.535"/>
+        <dia:point val="92.7203,-10.7"/>
+        <dia:point val="94.3863,-10.7"/>
+        <dia:point val="94.3863,-4.135"/>
+        <dia:point val="96.0523,-4.135"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -17295,8 +17334,8 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O6" connection="36"/>
-        <dia:connection handle="1" to="O80" connection="22"/>
+        <dia:connection handle="0" to="O6" connection="42"/>
+        <dia:connection handle="1" to="O80" connection="18"/>
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O82">
@@ -17728,17 +17767,17 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O83">
       <dia:attribute name="obj_pos">
-        <dia:point val="85.035,-1.95"/>
+        <dia:point val="84.335,-3"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="84.185,-2;107.588,10"/>
+        <dia:rectangle val="83.485,-3.05;107.588,10"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="85.035,-1.95"/>
-        <dia:point val="85.035,9.15"/>
+        <dia:point val="84.335,-3"/>
+        <dia:point val="84.335,9.15"/>
         <dia:point val="107.538,9.15"/>
         <dia:point val="107.538,9.95"/>
       </dia:attribute>
@@ -17779,8 +17818,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.538,18.15"/>
-        <dia:point val="107.538,19.87"/>
-        <dia:point val="97.1607,19.87"/>
+        <dia:point val="107.538,19.47"/>
+        <dia:point val="97.1607,19.47"/>
         <dia:point val="97.1607,20.79"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -17820,8 +17859,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.538,18.15"/>
-        <dia:point val="107.538,19.85"/>
-        <dia:point val="122.108,19.85"/>
+        <dia:point val="107.538,19.45"/>
+        <dia:point val="122.108,19.45"/>
         <dia:point val="122.108,20.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -18333,7 +18372,7 @@
         <dia:point val="37.97,-14.25"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.92,-15.05;46,-13.45"/>
+        <dia:rectangle val="37.92,-18.4;46.75,-13.45"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -18341,8 +18380,8 @@
       <dia:attribute name="orth_points">
         <dia:point val="37.97,-14.25"/>
         <dia:point val="41.6707,-14.25"/>
-        <dia:point val="41.6707,-14.25"/>
-        <dia:point val="45.95,-14.25"/>
+        <dia:point val="41.6707,-17.6"/>
+        <dia:point val="46.7,-17.6"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
@@ -18363,5 +18402,253 @@
         <dia:connection handle="1" to="O5" connection="28"/>
       </dia:connections>
     </dia:object>
+    <dia:object type="UML - Class" version="0" id="O88">
+      <dia:attribute name="obj_pos">
+        <dia:point val="111.923,-6.335"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="111.873,-6.385;132.108,-2.685"/>
+      </dia:attribute>
+      <dia:attribute name="elem_corner">
+        <dia:point val="111.923,-6.335"/>
+      </dia:attribute>
+      <dia:attribute name="elem_width">
+        <dia:real val="20.135000000000002"/>
+      </dia:attribute>
+      <dia:attribute name="elem_height">
+        <dia:real val="3.5999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>#TimerEvent#</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="comment">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="abstract">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_attributes">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="suppress_operations">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="visible_attributes">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="visible_comments">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_operations">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="wrap_after_char">
+        <dia:int val="40"/>
+      </dia:attribute>
+      <dia:attribute name="comment_line_length">
+        <dia:int val="17"/>
+      </dia:attribute>
+      <dia:attribute name="comment_tagging">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="line_width">
+        <dia:real val="0.10000000000000001"/>
+      </dia:attribute>
+      <dia:attribute name="line_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="fill_color">
+        <dia:color val="#ffffff"/>
+      </dia:attribute>
+      <dia:attribute name="text_color">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font">
+        <dia:font family="monospace" style="0" name="Courier"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font">
+        <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font">
+        <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font">
+        <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font">
+        <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font">
+        <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+      </dia:attribute>
+      <dia:attribute name="normal_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="polymorphic_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_font_height">
+        <dia:real val="0.80000000000000004"/>
+      </dia:attribute>
+      <dia:attribute name="classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="abstract_classname_font_height">
+        <dia:real val="1"/>
+      </dia:attribute>
+      <dia:attribute name="comment_font_height">
+        <dia:real val="0.69999999999999996"/>
+      </dia:attribute>
+      <dia:attribute name="attributes"/>
+      <dia:attribute name="operations">
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#m_registerTimer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#timer_id_t#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="true"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#pev#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#TimerEvent*#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="3"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+        <dia:composite type="umloperation">
+          <dia:attribute name="name">
+            <dia:string>#m_unregisterTimer#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="stereotype">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#bool#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="visibility">
+            <dia:enum val="1"/>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="abstract">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="inheritance_type">
+            <dia:enum val="2"/>
+          </dia:attribute>
+          <dia:attribute name="query">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="class_scope">
+            <dia:boolean val="true"/>
+          </dia:attribute>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#pev#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#TimerEvent*#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="3"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
+        </dia:composite>
+      </dia:attribute>
+      <dia:attribute name="template">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="templates"/>
+    </dia:object>
+    <dia:object type="UML - Realizes" version="1" id="O89">
+      <dia:attribute name="obj_pos">
+        <dia:point val="108.203,-4.135"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="108.153,-5.135;111.923,-3.285"/>
+      </dia:attribute>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="108.203,-4.135"/>
+        <dia:point val="110.038,-4.135"/>
+        <dia:point val="110.038,-4.535"/>
+        <dia:point val="111.873,-4.535"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="stereotype">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O80" connection="18"/>
+        <dia:connection handle="1" to="O88" connection="12"/>
+      </dia:connections>
+    </dia:object>
   </dia:layer>
 </dia:diagram>
diff --git a/doc/class-diagram.png b/doc/class-diagram.png
index 17fdb5dc..8aefd404 100644
Binary files a/doc/class-diagram.png and b/doc/class-diagram.png differ