--- a/model/uml/component5.svg	Fri Jun 08 08:10:46 2012 +0100
+++ b/model/uml/component5.svg	Fri Jun 08 08:12:27 2012 +0100
@@ -33,10 +33,10 @@
       ><path d="M0 0 L140 0 L140 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath10"
-      ><path d="M-7 -7 L51 -7 L51 25 L-7 25 L-7 -7 Z"
+      ><path d="M-7 -7 L52 -7 L52 25 L-7 25 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
-      ><path d="M-7 -7 L51 -7 L51 31 L-7 31 L-7 -7 Z"
+      ><path d="M-7 -7 L51 -7 L51 25 L-7 25 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
       ><path d="M-7 -7 L50 -7 L50 25 L-7 25 L-7 -7 Z"
@@ -57,13 +57,13 @@
       ><path d="M0 0 L314 0 L314 134 L0 134 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"
-      ><path d="M-39 -14 L78 -14 L78 28 L-39 28 L-39 -14 Z"
+      ><path d="M-40 -14 L80 -14 L80 28 L-40 28 L-40 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath19"
-      ><path d="M-40 -14 L80 -14 L80 28 L-40 28 L-40 -14 Z"
+      ><path d="M-39 -14 L78 -14 L78 28 L-39 28 L-39 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath20"
-      ><path d="M-40 -20 L80 -20 L80 40 L-40 40 L-40 -20 Z"
+      ><path d="M-41 -14 L82 -14 L82 28 L-41 28 L-41 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath21"
       ><path d="M-58 -14 L116 -14 L116 28 L-58 28 L-58 -14 Z"
@@ -161,30 +161,30 @@
       /><line y2="62" fill="none" x1="260" clip-path="url(#clipPath17)" x2="254" y1="50"
       /><line y2="62" fill="none" x1="260" clip-path="url(#clipPath17)" x2="266" y1="50"
     /></g
-    ><g font-size="11" transform="translate(150,133)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(253,78)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath18)" stroke="none"
       >0..*</text
     ></g
-    ><g font-size="11" transform="translate(105,103)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath19)" stroke="none"
-      >0..*</text
-    ></g
     ><g font-size="11" transform="translate(209,52)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath18)" stroke="none"
-      >0..*</text
-    ></g
-    ><g font-size="11" transform="translate(253,78)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath19)" stroke="none"
       >0..*</text
     ></g
-    ><g font-size="11" transform="translate(97,65)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(153,32)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath18)" stroke="none"
       >0..*</text
     ></g
-    ><g font-size="11" transform="translate(153,32)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(97,65)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath19)" stroke="none"
       >0..*</text
     ></g
+    ><g font-size="11" transform="translate(105,103)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath18)" stroke="none"
+      >0..*</text
+    ></g
+    ><g font-size="11" transform="translate(147,133)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath20)" stroke="none"
+      >0..1</text
+    ></g
     ><g font-size="11" transform="translate(303,267)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath21)" stroke="none"
       >bundle</text