diff --git a/doc/class-diagram.dia b/doc/class-diagram.dia
index e2849f55..c3b1a9d3 100644
--- a/doc/class-diagram.dia
+++ b/doc/class-diagram.dia
@@ -68,16 +68,16 @@
         <dia:point val="20.75,13.1"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="20.7,13.05;44.4,45.35"/>
+        <dia:rectangle val="20.7,13.05;43.63,48.55"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="20.75,13.1"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="23.600000000000001"/>
+        <dia:real val="22.829999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="32.200000000000017"/>
+        <dia:real val="35.40000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#SimulatorController#</dia:string>
@@ -215,10 +215,10 @@
         </dia:composite>
         <dia:composite type="umlattribute">
           <dia:attribute name="name">
-            <dia:string>#m_EvList#</dia:string>
+            <dia:string>#m_LstList#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#EventList#</dia:string>
+            <dia:string>#ListenerManager#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -861,10 +861,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -886,7 +886,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#BaseEvent*#</dia:string>
+            <dia:string>#BaseListener*#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -909,10 +909,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -957,10 +957,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -1002,7 +1002,25 @@
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="parameters"/>
+          <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#flow#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ExperimentFlow*#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="value">
+                <dia:string>#NULL#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="comment">
+                <dia:string>##</dia:string>
+              </dia:attribute>
+              <dia:attribute name="kind">
+                <dia:enum val="1"/>
+              </dia:attribute>
+            </dia:composite>
+          </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
@@ -1012,7 +1030,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#BaseEvent*#</dia:string>
+            <dia:string>#BaseListener*#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -1180,7 +1198,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onBreakpointEvent#</dia:string>
+            <dia:string>#onBreakpoint#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1207,6 +1225,23 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#cpu#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ConcreteCPU*#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
                 <dia:string>#instrPtr#</dia:string>
@@ -1224,11 +1259,28 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#address_space#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#address_t#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onMemoryAccessEvent#</dia:string>
+            <dia:string>#onMemoryAccess#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1255,6 +1307,23 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#cpu#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ConcreteCPU*#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
                 <dia:string>#addr#</dia:string>
@@ -1291,7 +1360,7 @@
             </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#rw#</dia:string>
+                <dia:string>#is_write#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#bool#</dia:string>
@@ -1306,11 +1375,28 @@
                 <dia:enum val="1"/>
               </dia:attribute>
             </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#instrPtr#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#addess_t#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
           </dia:attribute>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onInterruptEvent#</dia:string>
+            <dia:string>#onInterrupt#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1339,7 +1425,24 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#type#</dia:string>
+                <dia:string>#cpu#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ConcreteCPU*#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#interruptNum#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#unsigned#</dia:string>
@@ -1375,7 +1478,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onTrapEvent#</dia:string>
+            <dia:string>#onTrap#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1404,7 +1507,24 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#type#</dia:string>
+                <dia:string>#cpu#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ConcreteCPU*#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#trapNum#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#unsigned#</dia:string>
@@ -1423,7 +1543,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onGuestSystemEvent#</dia:string>
+            <dia:string>#onGuestSystem#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1488,7 +1608,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#onJumpEvent#</dia:string>
+            <dia:string>#onJump#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -1515,6 +1635,23 @@
             <dia:boolean val="false"/>
           </dia:attribute>
           <dia:attribute name="parameters">
+            <dia:composite type="umlparameter">
+              <dia:attribute name="name">
+                <dia:string>#cpu#</dia:string>
+              </dia:attribute>
+              <dia:attribute name="type">
+                <dia:string>#ConcreteCPU*#</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="1"/>
+              </dia:attribute>
+            </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
                 <dia:string>#flagTriggered#</dia:string>
@@ -2596,18 +2733,18 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.55,45.3505"/>
+        <dia:point val="32.165,48.5503"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="29.5825,45.3005;33.4,58.7497"/>
+        <dia:rectangle val="29.5825,48.5003;33.015,58.7497"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.55,45.3505"/>
-        <dia:point val="32.55,52.0251"/>
-        <dia:point val="29.6325,52.0251"/>
+        <dia:point val="32.165,48.5503"/>
+        <dia:point val="32.165,54.025"/>
+        <dia:point val="29.6325,54.025"/>
         <dia:point val="29.6325,58.6997"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -2747,17 +2884,17 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O4">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.55,45.3484"/>
+        <dia:point val="32.165,48.5497"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.7,45.2984;38.0438,51.665"/>
+        <dia:rectangle val="31.315,48.4997;38.0438,51.665"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.55,45.3484"/>
-        <dia:point val="32.55,50.275"/>
+        <dia:point val="32.165,48.5497"/>
+        <dia:point val="32.165,50.275"/>
         <dia:point val="37.9938,50.275"/>
         <dia:point val="37.9938,51.615"/>
       </dia:attribute>
@@ -2788,19 +2925,19 @@
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="46.7,-27.7"/>
+        <dia:point val="47.1,-21.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="46.65,-27.75;69.965,-6.65"/>
+        <dia:rectangle val="47.05,-21.55;69.98,-6.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="46.7,-27.7"/>
+        <dia:point val="47.1,-21.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="23.215"/>
+        <dia:real val="22.829999999999998"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="21.000000000000007"/>
+        <dia:real val="15.400000000000002"/>
       </dia:attribute>
       <dia:attribute name="name">
         <dia:string>#ListenerManager#</dia:string>
@@ -2895,7 +3032,7 @@
             <dia:string>#m_pFired#</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#BaseEvent*#</dia:string>
+            <dia:string>#BaseListener*#</dia:string>
           </dia:attribute>
           <dia:attribute name="value">
             <dia:string>##</dia:string>
@@ -2982,52 +3119,6 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#m_Bp_cache#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#BufferCache&lt;BPEvent*&gt;#</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:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#m_Io_cache#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#BufferCache&lt;IOPortEvent*&gt;#</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">
@@ -3061,10 +3152,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3078,7 +3169,7 @@
             </dia:composite>
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#pExp#</dia:string>
+                <dia:string>#flow#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
                 <dia:string>#ExperimentFlow*#</dia:string>
@@ -3126,58 +3217,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#getEventsOf#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#const eventlist_t*#</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="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#pWhat#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#ExperimentFlow*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3214,7 +3257,7 @@
             <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="query">
-            <dia:boolean val="false"/>
+            <dia:boolean val="true"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
@@ -3229,7 +3272,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#BaseEvent*#</dia:string>
+            <dia:string>#BaseListener*#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3330,10 +3373,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#pEv#</dia:string>
+                <dia:string>#li#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3349,7 +3392,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#getEventCount#</dia:string>
+            <dia:string>#getListenerCount#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -3370,7 +3413,7 @@
             <dia:enum val="2"/>
           </dia:attribute>
           <dia:attribute name="query">
-            <dia:boolean val="false"/>
+            <dia:boolean val="true"/>
           </dia:attribute>
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
@@ -3385,7 +3428,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#iterator#</dia:string>
+            <dia:string>#void#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="1"/>
@@ -3408,27 +3451,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#it#</dia:string>
+                <dia:string>#idx#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#iterator#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#skip_deletelist#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#bool#</dia:string>
+                <dia:string>#index_t#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3450,7 +3476,7 @@
             <dia:string>##</dia:string>
           </dia:attribute>
           <dia:attribute name="type">
-            <dia:string>#iterator#</dia:string>
+            <dia:string>#void#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
             <dia:enum val="0"/>
@@ -3473,10 +3499,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#it#</dia:string>
+                <dia:string>#flow#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#iterator #</dia:string>
+                <dia:string>#ExperimentFlow*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3552,7 +3578,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#fireActiveEvents#</dia:string>
+            <dia:string>#triggerActiveListeners#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -3582,67 +3608,7 @@
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
-            <dia:string>#getBPBuffer#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#BufferCache&lt;BPEvent*&gt;&amp;#</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="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>#getIOBuffer#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#BufferCache&lt;IOPortEvent*&gt;&amp;#</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="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>#addToCaches#</dia:string>
+            <dia:string>#makeActive#</dia:string>
           </dia:attribute>
           <dia:attribute name="stereotype">
             <dia:string>##</dia:string>
@@ -3651,7 +3617,7 @@
             <dia:string>#void#</dia:string>
           </dia:attribute>
           <dia:attribute name="visibility">
-            <dia:enum val="1"/>
+            <dia:enum val="0"/>
           </dia:attribute>
           <dia:attribute name="comment">
             <dia:string>##</dia:string>
@@ -3671,10 +3637,10 @@
           <dia:attribute name="parameters">
             <dia:composite type="umlparameter">
               <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
+                <dia:string>#pLi#</dia:string>
               </dia:attribute>
               <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</dia:string>
+                <dia:string>#BaseListener*#</dia:string>
               </dia:attribute>
               <dia:attribute name="value">
                 <dia:string>##</dia:string>
@@ -3688,84 +3654,6 @@
             </dia:composite>
           </dia:attribute>
         </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#removeFromCaches#</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="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="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#ev#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#BaseEvent*#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#clearCaches#</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="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="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters"/>
-        </dia:composite>
       </dia:attribute>
       <dia:attribute name="template">
         <dia:boolean val="false"/>
@@ -4380,17 +4268,17 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
-        <dia:point val="69.915,-23.4"/>
+        <dia:point val="69.93,-19.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="69.165,-24.2;84.92,-17.6"/>
+        <dia:rectangle val="69.18,-20.4;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.915,-23.4"/>
-        <dia:point val="84.335,-23.4"/>
+        <dia:point val="69.93,-19.6"/>
+        <dia:point val="84.335,-19.6"/>
         <dia:point val="84.335,-18.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -4407,7 +4295,7 @@
         <dia:color val="#000000"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O5" connection="15"/>
+        <dia:connection handle="0" to="O5" connection="9"/>
         <dia:connection handle="1" to="O6" connection="1"/>
       </dia:connections>
     </dia:object>
@@ -4694,13 +4582,13 @@
         <dia:point val="42.25,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="42.2,6.75;57.045,10.45"/>
+        <dia:rectangle val="42.2,6.75;52.04,10.45"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="42.25,6.8"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="14.744999999999999"/>
+        <dia:real val="9.7400000000000002"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
         <dia:real val="3.5999999999999996"/>
@@ -4822,25 +4710,7 @@
           <dia:attribute name="class_scope">
             <dia:boolean val="false"/>
           </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#ped#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#ExperimentData*#</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:attribute name="parameters"/>
         </dia:composite>
         <dia:composite type="umloperation">
           <dia:attribute name="name">
@@ -4990,18 +4860,18 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="49.6225,6.8"/>
+        <dia:point val="47.12,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="38.2975,-1.95;50.4725,6.85"/>
+        <dia:rectangle val="38.2975,-1.95;47.97,6.85"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="49.6225,6.8"/>
-        <dia:point val="49.6225,2.45"/>
-        <dia:point val="38.3475,2.45"/>
+        <dia:point val="47.12,6.8"/>
+        <dia:point val="47.12,2.05"/>
+        <dia:point val="38.3475,2.05"/>
         <dia:point val="38.3475,-1.9"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -5141,18 +5011,18 @@
     </dia:object>
     <dia:object type="UML - Realizes" version="1" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="49.6225,6.8"/>
+        <dia:point val="47.12,6.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="48.7725,-0.315;55.105,6.85"/>
+        <dia:rectangle val="46.27,-0.315;55.105,6.85"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="49.6225,6.8"/>
-        <dia:point val="49.6225,3.2675"/>
-        <dia:point val="55.055,3.2675"/>
+        <dia:point val="47.12,6.8"/>
+        <dia:point val="47.12,2.8675"/>
+        <dia:point val="55.055,2.8675"/>
         <dia:point val="55.055,-0.265"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -5218,17 +5088,17 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
-        <dia:point val="32.55,13.0497"/>
+        <dia:point val="32.165,13.0499"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="31.8,6.7;42.3,13.8497"/>
+        <dia:rectangle val="31.415,6.7;42.3,13.8499"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.55,13.0497"/>
-        <dia:point val="32.55,12.8"/>
+        <dia:point val="32.165,13.0499"/>
+        <dia:point val="32.165,12.8"/>
         <dia:point val="41.85,12.8"/>
         <dia:point val="41.85,7.5"/>
         <dia:point val="42.25,7.5"/>
@@ -5733,8 +5603,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.38,6.55"/>
-        <dia:point val="-3.38,5.2175"/>
-        <dia:point val="-3.35,5.2175"/>
+        <dia:point val="-3.38,4.8675"/>
+        <dia:point val="-3.35,4.8675"/>
         <dia:point val="-3.35,3.885"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -5878,8 +5748,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="-3.35,1.085"/>
-        <dia:point val="-3.35,-1.3975"/>
-        <dia:point val="-3.415,-1.3975"/>
+        <dia:point val="-3.35,-1.7975"/>
+        <dia:point val="-3.415,-1.7975"/>
         <dia:point val="-3.415,-3.88"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6450,15 +6320,15 @@
         <dia:point val="32.25,-3.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="28.0501,-7.08;45.7901,-2.6"/>
+        <dia:rectangle val="28.0501,-7.08;46.1651,-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.175,-3.4"/>
-        <dia:point val="30.175,-6.28"/>
+        <dia:point val="30.55,-3.4"/>
+        <dia:point val="30.55,-6.28"/>
         <dia:point val="28.1001,-6.28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -6528,8 +6398,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="2.34,-5.38"/>
-        <dia:point val="8.0588,-5.38"/>
-        <dia:point val="8.0588,-6.28"/>
+        <dia:point val="7.6838,-5.38"/>
+        <dia:point val="7.6838,-6.28"/>
         <dia:point val="13.7776,-6.28"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -7217,8 +7087,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2301,22.85"/>
-        <dia:point val="1.2301,21.525"/>
-        <dia:point val="8.2251,21.525"/>
+        <dia:point val="1.2301,21.175"/>
+        <dia:point val="8.2251,21.175"/>
         <dia:point val="8.2251,20.2"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -7242,17 +7112,17 @@
     </dia:object>
     <dia:object type="UML - Dependency" version="1" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="20.7009,29.2"/>
+        <dia:point val="20.6998,30.8"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.7726,25.3;20.7509,29.25"/>
+        <dia:rectangle val="12.7726,25.3;20.7498,30.85"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="20.7009,29.2"/>
-        <dia:point val="15.7111,29.2"/>
+        <dia:point val="20.6998,30.8"/>
+        <dia:point val="15.7111,30.8"/>
         <dia:point val="15.7111,25.75"/>
         <dia:point val="13.2226,25.75"/>
       </dia:attribute>
@@ -7466,8 +7336,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2301,27.85"/>
-        <dia:point val="1.2301,29.3575"/>
-        <dia:point val="1.2201,29.3575"/>
+        <dia:point val="1.2301,29.7075"/>
+        <dia:point val="1.2201,29.7075"/>
         <dia:point val="1.2201,30.865"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -8053,8 +7923,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="1.2201,33.665"/>
-        <dia:point val="1.2201,34.94"/>
-        <dia:point val="1.2476,34.94"/>
+        <dia:point val="1.2201,35.29"/>
+        <dia:point val="1.2476,35.29"/>
         <dia:point val="1.2476,36.215"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -8450,8 +8320,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="15.4176,4.8879"/>
-        <dia:point val="15.4176,3.1004"/>
-        <dia:point val="10.9926,3.1004"/>
+        <dia:point val="15.4176,2.7004"/>
+        <dia:point val="10.9926,2.7004"/>
         <dia:point val="10.9926,1.3129"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -10568,17 +10438,17 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
-        <dia:point val="44.35,38.4"/>
+        <dia:point val="43.58,39.2"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.3,37.6;53.4423,71.94"/>
+        <dia:rectangle val="43.53,38.4;53.4423,71.94"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="44.35,38.4"/>
-        <dia:point val="46.337,38.4"/>
+        <dia:point val="43.58,39.2"/>
+        <dia:point val="46.337,39.2"/>
         <dia:point val="46.337,71.14"/>
         <dia:point val="53.3923,71.14"/>
       </dia:attribute>
@@ -11007,8 +10877,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="73.3804,26.6153"/>
-        <dia:point val="73.3804,28.59"/>
-        <dia:point val="70.4279,28.59"/>
+        <dia:point val="73.3804,28.99"/>
+        <dia:point val="70.4279,28.99"/>
         <dia:point val="70.4279,30.5647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11158,8 +11028,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="73.3804,26.6153"/>
-        <dia:point val="73.3804,28.59"/>
-        <dia:point val="75.4429,28.59"/>
+        <dia:point val="73.3804,28.99"/>
+        <dia:point val="75.4429,28.99"/>
         <dia:point val="75.4429,30.5647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11309,8 +11179,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="3.9125,57.7403"/>
-        <dia:point val="3.9125,59.7275"/>
-        <dia:point val="3.91129,59.7275"/>
+        <dia:point val="3.9125,60.1275"/>
+        <dia:point val="3.91129,60.1275"/>
         <dia:point val="3.91129,61.7147"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -11350,8 +11220,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="62.8825,23.3625"/>
-        <dia:point val="64.805,23.3625"/>
-        <dia:point val="64.805,24.465"/>
+        <dia:point val="65.205,23.3625"/>
+        <dia:point val="65.205,24.465"/>
         <dia:point val="66.7275,24.465"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -12002,8 +11872,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="143.986,-12.7722"/>
-        <dia:point val="143.986,-9.44126"/>
-        <dia:point val="139.032,-9.44126"/>
+        <dia:point val="143.986,-9.04126"/>
+        <dia:point val="139.032,-9.04126"/>
         <dia:point val="139.032,-6.11028"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -12043,8 +11913,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="143.986,-12.7722"/>
-        <dia:point val="143.986,-9.41625"/>
-        <dia:point val="148.481,-9.41625"/>
+        <dia:point val="143.986,-9.01625"/>
+        <dia:point val="148.481,-9.01625"/>
         <dia:point val="148.481,-6.06026"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -13247,17 +13117,17 @@
         <dia:boolean val="false"/>
       </dia:attribute>
       <dia:attribute name="obj_pos">
-        <dia:point val="44.35,33.6"/>
+        <dia:point val="43.58,33.6"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="44.3,33.55;63.375,47.8653"/>
+        <dia:rectangle val="43.53,33.55;63.375,47.8653"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="44.35,33.6"/>
-        <dia:point val="44.35,37.0187"/>
+        <dia:point val="43.58,33.6"/>
+        <dia:point val="43.58,37.0187"/>
         <dia:point val="61.987,37.0187"/>
         <dia:point val="61.987,44.5812"/>
         <dia:point val="63.175,44.5812"/>
@@ -13332,8 +13202,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="32.4726,2.83475"/>
-        <dia:point val="32.4726,-0.972627"/>
-        <dia:point val="28.1001,-0.972627"/>
+        <dia:point val="32.4726,-0.597627"/>
+        <dia:point val="28.1001,-0.597627"/>
         <dia:point val="28.1001,-4.78"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -13568,8 +13438,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="74.3979,71.14"/>
-        <dia:point val="77.3612,71.14"/>
-        <dia:point val="77.3612,71.565"/>
+        <dia:point val="77.7612,71.14"/>
+        <dia:point val="77.7612,71.565"/>
         <dia:point val="80.3246,71.565"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -15507,8 +15377,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="84.335,-4.6"/>
-        <dia:point val="84.335,-2.05522"/>
-        <dia:point val="71.2307,-2.05522"/>
+        <dia:point val="84.335,-1.65522"/>
+        <dia:point val="71.2307,-1.65522"/>
         <dia:point val="71.2307,0.489551"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -15768,8 +15638,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="71.2307,15.1904"/>
-        <dia:point val="71.2307,16.7026"/>
-        <dia:point val="66.1898,16.7026"/>
+        <dia:point val="71.2307,17.1026"/>
+        <dia:point val="66.1898,17.1026"/>
         <dia:point val="66.1898,18.2147"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -15809,8 +15679,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="71.2307,15.1904"/>
-        <dia:point val="71.2307,16.8276"/>
-        <dia:point val="79.486,16.8276"/>
+        <dia:point val="71.2307,17.2276"/>
+        <dia:point val="79.486,17.2276"/>
         <dia:point val="79.486,18.4647"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -16810,8 +16680,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="92.7203,-11.5"/>
-        <dia:point val="94.3863,-11.5"/>
-        <dia:point val="94.3863,-4.135"/>
+        <dia:point val="94.7863,-11.5"/>
+        <dia:point val="94.7863,-4.135"/>
         <dia:point val="96.0523,-4.135"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -17319,8 +17189,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.538,18.1"/>
-        <dia:point val="107.538,19.445"/>
-        <dia:point val="97.1607,19.445"/>
+        <dia:point val="107.538,19.845"/>
+        <dia:point val="97.1607,19.845"/>
         <dia:point val="97.1607,20.79"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -17360,8 +17230,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.538,18.1"/>
-        <dia:point val="107.538,19.425"/>
-        <dia:point val="122.108,19.425"/>
+        <dia:point val="107.538,19.825"/>
+        <dia:point val="122.108,19.825"/>
         <dia:point val="122.108,20.75"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -17390,520 +17260,6 @@
       </dia:connections>
     </dia:object>
     <dia:object type="UML - Class" version="0" id="O86">
-      <dia:attribute name="obj_pos">
-        <dia:point val="13.6,-17.95"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.55,-18.7;38.42,-9.7"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="13.6,-17.95"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="24.370000000000001"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="8.1999999999999993"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#BufferCache#</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:composite type="umlattribute">
-          <dia:attribute name="name">
-            <dia:string>#m_Buffer#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#std::list&lt;T&gt;#</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">
-          <dia:attribute name="name">
-            <dia:string>#add#</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="2"/>
-          </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 type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#val#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#const T&amp;#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#remove#</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="2"/>
-          </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 type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#val#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#const T&amp;#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#erase#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#iterator#</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="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#idx#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#iterator#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-        <dia:composite type="umloperation">
-          <dia:attribute name="name">
-            <dia:string>#clear#</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="2"/>
-          </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>#begin#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#iterator#</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="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>#end#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#iterator#</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="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>#makeActive#</dia:string>
-          </dia:attribute>
-          <dia:attribute name="stereotype">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#iterator#</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="false"/>
-          </dia:attribute>
-          <dia:attribute name="class_scope">
-            <dia:boolean val="false"/>
-          </dia:attribute>
-          <dia:attribute name="parameters">
-            <dia:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#ev_list#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#EventList#</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:composite type="umlparameter">
-              <dia:attribute name="name">
-                <dia:string>#idx#</dia:string>
-              </dia:attribute>
-              <dia:attribute name="type">
-                <dia:string>#iterator#</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="1"/>
-              </dia:attribute>
-            </dia:composite>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-      <dia:attribute name="template">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="templates">
-        <dia:composite type="umlformalparameter">
-          <dia:attribute name="name">
-            <dia:string>##</dia:string>
-          </dia:attribute>
-          <dia:attribute name="type">
-            <dia:string>#T#</dia:string>
-          </dia:attribute>
-        </dia:composite>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="UML - Association" version="2" id="O87">
-      <dia:attribute name="name">
-        <dia:string>#&lt;&lt;friend&gt;&gt;#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="direction">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="show_direction">
-        <dia:boolean val="true"/>
-      </dia:attribute>
-      <dia:attribute name="assoc_type">
-        <dia:enum val="0"/>
-      </dia:attribute>
-      <dia:attribute name="role_a">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="multipicity_a">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="visibility_a">
-        <dia:enum val="3"/>
-      </dia:attribute>
-      <dia:attribute name="show_arrow_a">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="role_b">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="multipicity_b">
-        <dia:string>##</dia:string>
-      </dia:attribute>
-      <dia:attribute name="visibility_b">
-        <dia:enum val="3"/>
-      </dia:attribute>
-      <dia:attribute name="show_arrow_b">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="obj_pos">
-        <dia:point val="37.97,-14.25"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="37.92,-19.2;46.75,-13.45"/>
-      </dia:attribute>
-      <dia:attribute name="meta">
-        <dia:composite type="dict"/>
-      </dia:attribute>
-      <dia:attribute name="orth_points">
-        <dia:point val="37.97,-14.25"/>
-        <dia:point val="41.6707,-14.25"/>
-        <dia:point val="41.6707,-18.4"/>
-        <dia:point val="46.7,-18.4"/>
-      </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="false"/>
-      </dia:attribute>
-      <dia:attribute name="text_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="line_colour">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O86" connection="13"/>
-        <dia:connection handle="1" to="O5" connection="26"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="UML - Class" version="0" id="O88">
       <dia:attribute name="obj_pos">
         <dia:point val="111.573,-5.935"/>
       </dia:attribute>
@@ -18110,20 +17466,20 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O89">
+    <dia:object type="UML - Realizes" version="1" id="O87">
       <dia:attribute name="obj_pos">
         <dia:point val="108.203,-4.135"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="108.203,-4.935;111.593,-3.335"/>
+        <dia:rectangle val="108.153,-4.985;111.573,-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="108.203,-4.135"/>
-        <dia:point val="111.523,-4.135"/>
+        <dia:point val="109.053,-4.135"/>
+        <dia:point val="111.473,-4.135"/>
         <dia:point val="111.523,-4.135"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -18148,10 +17504,10 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O80" connection="18"/>
-        <dia:connection handle="1" to="O88" connection="12"/>
+        <dia:connection handle="1" to="O86" connection="12"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O90">
+    <dia:object type="UML - Class" version="0" id="O88">
       <dia:attribute name="obj_pos">
         <dia:point val="102.064,-31.825"/>
       </dia:attribute>
@@ -18261,7 +17617,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O91">
+    <dia:object type="UML - Class" version="0" id="O89">
       <dia:attribute name="obj_pos">
         <dia:point val="95.1393,-27.085"/>
       </dia:attribute>
@@ -18474,7 +17830,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O92">
+    <dia:object type="UML - Realizes" version="1" id="O90">
       <dia:attribute name="obj_pos">
         <dia:point val="104.68,-29.5747"/>
       </dia:attribute>
@@ -18486,8 +17842,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="104.68,-29.5747"/>
-        <dia:point val="104.68,-28.355"/>
-        <dia:point val="105.784,-28.355"/>
+        <dia:point val="104.68,-27.955"/>
+        <dia:point val="105.784,-27.955"/>
         <dia:point val="105.784,-27.1353"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -18511,11 +17867,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O91" connection="14"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O89" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O93">
+    <dia:object type="UML - Class" version="0" id="O91">
       <dia:attribute name="obj_pos">
         <dia:point val="119.489,-36.435"/>
       </dia:attribute>
@@ -19031,7 +18387,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O94">
+    <dia:object type="UML - Realizes" version="1" id="O92">
       <dia:attribute name="obj_pos">
         <dia:point val="107.347,-30.725"/>
       </dia:attribute>
@@ -19043,8 +18399,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.347,-30.725"/>
-        <dia:point val="113.393,-30.725"/>
-        <dia:point val="113.393,-30.735"/>
+        <dia:point val="113.793,-30.725"/>
+        <dia:point val="113.793,-30.735"/>
         <dia:point val="119.439,-30.735"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -19068,11 +18424,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O93" connection="32"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O91" connection="32"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O95">
+    <dia:object type="UML - Class" version="0" id="O93">
       <dia:attribute name="obj_pos">
         <dia:point val="81.6631,-36.835"/>
       </dia:attribute>
@@ -19285,7 +18641,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O96">
+    <dia:object type="UML - Realizes" version="1" id="O94">
       <dia:attribute name="obj_pos">
         <dia:point val="102.014,-30.725"/>
       </dia:attribute>
@@ -19297,8 +18653,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="102.014,-30.725"/>
-        <dia:point val="99.4286,-30.725"/>
-        <dia:point val="99.4286,-34.735"/>
+        <dia:point val="99.0286,-30.725"/>
+        <dia:point val="99.0286,-34.735"/>
         <dia:point val="96.8436,-34.735"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -19322,11 +18678,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O95" connection="14"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O93" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O97">
+    <dia:object type="UML - Class" version="0" id="O95">
       <dia:attribute name="obj_pos">
         <dia:point val="81.9831,-30.085"/>
       </dia:attribute>
@@ -19539,7 +18895,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O98">
+    <dia:object type="UML - Realizes" version="1" id="O96">
       <dia:attribute name="obj_pos">
         <dia:point val="102.014,-30.725"/>
       </dia:attribute>
@@ -19551,8 +18907,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="102.014,-30.725"/>
-        <dia:point val="96.316,-30.725"/>
-        <dia:point val="96.316,-27.985"/>
+        <dia:point val="95.916,-30.725"/>
+        <dia:point val="95.916,-27.985"/>
         <dia:point val="90.6184,-27.985"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -19576,11 +18932,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O97" connection="14"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O95" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O99">
+    <dia:object type="UML - Class" version="0" id="O97">
       <dia:attribute name="obj_pos">
         <dia:point val="112.733,-44.135"/>
       </dia:attribute>
@@ -19894,7 +19250,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O100">
+    <dia:object type="UML - Realizes" version="1" id="O98">
       <dia:attribute name="obj_pos">
         <dia:point val="107.347,-30.725"/>
       </dia:attribute>
@@ -19906,8 +19262,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.347,-30.725"/>
-        <dia:point val="110.015,-30.725"/>
-        <dia:point val="110.015,-40.835"/>
+        <dia:point val="110.415,-30.725"/>
+        <dia:point val="110.415,-40.835"/>
         <dia:point val="112.683,-40.835"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -19931,11 +19287,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O99" connection="20"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O97" connection="20"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O101">
+    <dia:object type="UML - Class" version="0" id="O99">
       <dia:attribute name="obj_pos">
         <dia:point val="111.448,-16.685"/>
       </dia:attribute>
@@ -20415,7 +19771,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O102">
+    <dia:object type="UML - Realizes" version="1" id="O100">
       <dia:attribute name="obj_pos">
         <dia:point val="92.7203,-11.5"/>
       </dia:attribute>
@@ -20427,8 +19783,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="92.7203,-11.5"/>
-        <dia:point val="102.059,-11.5"/>
-        <dia:point val="102.059,-11.785"/>
+        <dia:point val="102.459,-11.5"/>
+        <dia:point val="102.459,-11.785"/>
         <dia:point val="111.398,-11.785"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -20453,10 +19809,10 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O6" connection="38"/>
-        <dia:connection handle="1" to="O101" connection="28"/>
+        <dia:connection handle="1" to="O99" connection="28"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O103">
+    <dia:object type="UML - Class" version="0" id="O101">
       <dia:attribute name="obj_pos">
         <dia:point val="110.273,-54.51"/>
       </dia:attribute>
@@ -20669,7 +20025,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O104">
+    <dia:object type="UML - Realizes" version="1" id="O102">
       <dia:attribute name="obj_pos">
         <dia:point val="107.347,-30.725"/>
       </dia:attribute>
@@ -20681,8 +20037,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="107.347,-30.725"/>
-        <dia:point val="108.785,-30.725"/>
-        <dia:point val="108.785,-52.41"/>
+        <dia:point val="109.185,-30.725"/>
+        <dia:point val="109.185,-52.41"/>
         <dia:point val="110.223,-52.41"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -20706,11 +20062,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O103" connection="14"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O101" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O105">
+    <dia:object type="UML - Class" version="0" id="O103">
       <dia:attribute name="obj_pos">
         <dia:point val="80.6231,-45.735"/>
       </dia:attribute>
@@ -21054,7 +20410,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O106">
+    <dia:object type="UML - Realizes" version="1" id="O104">
       <dia:attribute name="obj_pos">
         <dia:point val="102.014,-30.725"/>
       </dia:attribute>
@@ -21066,8 +20422,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="102.014,-30.725"/>
-        <dia:point val="100.449,-30.725"/>
-        <dia:point val="100.449,-42.035"/>
+        <dia:point val="100.049,-30.725"/>
+        <dia:point val="100.049,-42.035"/>
         <dia:point val="98.8834,-42.035"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -21091,11 +20447,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O105" connection="22"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O103" connection="22"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O107">
+    <dia:object type="UML - Class" version="0" id="O105">
       <dia:attribute name="obj_pos">
         <dia:point val="95.2731,-51.985"/>
       </dia:attribute>
@@ -21308,7 +20664,7 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O108">
+    <dia:object type="UML - Realizes" version="1" id="O106">
       <dia:attribute name="obj_pos">
         <dia:point val="104.68,-31.8753"/>
       </dia:attribute>
@@ -21320,8 +20676,8 @@
       </dia:attribute>
       <dia:attribute name="orth_points">
         <dia:point val="104.68,-31.8753"/>
-        <dia:point val="104.68,-39.805"/>
-        <dia:point val="101.298,-39.805"/>
+        <dia:point val="104.68,-40.205"/>
+        <dia:point val="101.298,-40.205"/>
         <dia:point val="101.298,-47.7347"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -21345,11 +20701,11 @@
         <dia:string>##</dia:string>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O90" connection="8"/>
-        <dia:connection handle="1" to="O107" connection="14"/>
+        <dia:connection handle="0" to="O88" connection="8"/>
+        <dia:connection handle="1" to="O105" connection="14"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="UML - Class" version="0" id="O109">
+    <dia:object type="UML - Class" version="0" id="O107">
       <dia:attribute name="obj_pos">
         <dia:point val="20.0248,54.74"/>
       </dia:attribute>
@@ -21459,20 +20815,20 @@
       </dia:attribute>
       <dia:attribute name="templates"/>
     </dia:object>
-    <dia:object type="UML - Realizes" version="1" id="O110">
+    <dia:object type="UML - Realizes" version="1" id="O108">
       <dia:attribute name="obj_pos">
-        <dia:point val="32.55,45.3505"/>
+        <dia:point val="32.165,48.5503"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="23.781,45.3005;33.4,54.7397"/>
+        <dia:rectangle val="23.781,48.5003;33.015,54.7397"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="32.55,45.3505"/>
-        <dia:point val="32.55,50.0201"/>
-        <dia:point val="23.831,50.0201"/>
+        <dia:point val="32.165,48.5503"/>
+        <dia:point val="32.165,52.02"/>
+        <dia:point val="23.831,52.02"/>
         <dia:point val="23.831,54.6897"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
@@ -21497,7 +20853,82 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O0" connection="80"/>
-        <dia:connection handle="1" to="O109" connection="8"/>
+        <dia:connection handle="1" to="O107" connection="8"/>
+      </dia:connections>
+    </dia:object>
+    <dia:object type="UML - Association" version="2" id="O109">
+      <dia:attribute name="name">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="direction">
+        <dia:enum val="1"/>
+      </dia:attribute>
+      <dia:attribute name="show_direction">
+        <dia:boolean val="true"/>
+      </dia:attribute>
+      <dia:attribute name="assoc_type">
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="role_a">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="multipicity_a">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="visibility_a">
+        <dia:enum val="3"/>
+      </dia:attribute>
+      <dia:attribute name="show_arrow_a">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="role_b">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="multipicity_b">
+        <dia:string>##</dia:string>
+      </dia:attribute>
+      <dia:attribute name="visibility_b">
+        <dia:enum val="3"/>
+      </dia:attribute>
+      <dia:attribute name="show_arrow_b">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="obj_pos">
+        <dia:point val="20.75,13.1"/>
+      </dia:attribute>
+      <dia:attribute name="obj_bb">
+        <dia:rectangle val="20.7,-14.65;47.15,14.7"/>
+      </dia:attribute>
+      <dia:attribute name="meta">
+        <dia:composite type="dict"/>
+      </dia:attribute>
+      <dia:attribute name="orth_points">
+        <dia:point val="20.75,13.1"/>
+        <dia:point val="22.4276,13.1"/>
+        <dia:point val="22.4276,1.89334"/>
+        <dia:point val="29.1276,1.89334"/>
+        <dia:point val="29.1276,-14.6"/>
+        <dia:point val="47.1,-14.6"/>
+      </dia:attribute>
+      <dia:attribute name="orth_orient">
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+        <dia:enum val="1"/>
+        <dia:enum val="0"/>
+      </dia:attribute>
+      <dia:attribute name="orth_autoroute">
+        <dia:boolean val="false"/>
+      </dia:attribute>
+      <dia:attribute name="text_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:attribute name="line_colour">
+        <dia:color val="#000000"/>
+      </dia:attribute>
+      <dia:connections>
+        <dia:connection handle="0" to="O0" connection="0"/>
+        <dia:connection handle="1" to="O5" connection="20"/>
       </dia:connections>
     </dia:object>
   </dia:layer>
diff --git a/doc/class-diagram.png b/doc/class-diagram.png
index d3e84ec5..41213dda 100644
Binary files a/doc/class-diagram.png and b/doc/class-diagram.png differ