diff --git a/images/containers_and_constructs.svg b/images/containers_and_constructs.svg
index 6b33db4..7439c21 100644
--- a/images/containers_and_constructs.svg
+++ b/images/containers_and_constructs.svg
@@ -5,265 +5,303 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 316.54724 340.66077"
-   height="340.66077"
-   width="316.54724"
-   xml:space="preserve"
+   id="svg2"
    version="1.1"
-   id="svg2"><metadata
+   xml:space="preserve"
+   width="318.71246"
+   height="362.3129"
+   viewBox="0 0 318.71246 362.3129"><metadata
      id="metadata8"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><g
-     transform="matrix(1.25,0,0,-1.25,-201.85706,760.92303)"
-     id="g10"><g
-       transform="scale(0.12,0.12)"
-       id="g12"><g
-         transform="scale(8.33333,8.33333)"
-         id="g14" /><g
-         transform="scale(8.33333,8.33333)"
-         id="g66"><text
-           id="text86"
+     id="defs6"><clipPath
+       id="clipPath4682"
+       clipPathUnits="userSpaceOnUse"><rect
+         clip-path="none"
+         transform="scale(1,-1)"
+         y="-352.22998"
+         x="159.53813"
+         height="14.434784"
+         width="49.078266"
+         id="rect4684"
+         style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></clipPath></defs><g
+     style="display:inline"
+     id="g10"
+     transform="matrix(1.25,0,0,-1.25,-199.69184,782.57517)"><g
+       style="display:inline"
+       id="g12"
+       transform="scale(0.12,0.12)"><g
+         id="g14"
+         transform="scale(8.33333,8.33333)" /><g
+         id="g66"
+         transform="scale(8.33333,8.33333)"><text
+           transform="matrix(0.836553,0,0,-1,187.2,569.48)"
            style="font-variant:normal;font-weight:normal;font-size:12.29759979px;font-family:'Times New Roman';-inkscape-font-specification:TimesNewRoman;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="matrix(0.836553,0,0,-1,187.2,569.48)"><tspan
-             id="tspan88"
+           id="text86"><tspan
+             x="0 8.6087999 14.776966 20.945133 27.115177"
              y="0"
-             x="0 8.6087999 14.776966 20.945133 27.115177">model</tspan><tspan
-             id="tspan90"
+             id="tspan88">model</tspan><tspan
+             x="-23.381701 -18.502668 -12.334501 -6.1644568 0.0037095801 3.7353721 7.3214259 11.053088 14.782588 19.661619"
              y="60.48"
-             x="-23.381701 -18.502668 -12.334501 -6.1644568 0.0037095801 3.7353721 7.3214259 11.053088 14.782588 19.661619">event-tree</tspan><tspan
-             id="tspan92"
+             id="tspan90">event-tree</tspan><tspan
+             x="-18.504551 -14.775051 -9.896018 -3.7278519 0.0038105999 3.7354732 7.321527 11.053189 14.782689 19.66172"
              y="121.92"
-             x="-18.504551 -14.775051 -9.896018 -3.7278519 0.0038105999 3.7354732 7.321527 11.053189 14.782689 19.66172">fault-tree</tspan><tspan
-             id="tspan94"
+             id="tspan92">fault-tree</tspan><tspan
+             x="-29.54985 -24.670818 -18.502651 -8.6088457 -2.4346731 3.7334936 9.90166 14.780692 20.948858"
              y="183.48"
-             x="-29.54985 -24.670818 -18.502651 -8.6088457 -2.4346731 3.7334936 9.90166 14.780692 20.948858">component</tspan><tspan
-             id="tspan96"
+             id="tspan94">component</tspan><tspan
+             x="165.10014 171.27431 176.15334 179.88281 186.05286 194.66167 199.68414 203.41579 209.44238"
              y="230.64"
-             x="165.10014 171.27431 176.15334 179.88281 186.05286 194.66167 199.68414 203.41579 209.44238">parameter</tspan><tspan
-             id="tspan98"
+             id="tspan96">parameter</tspan><tspan
+             x="165.10014 171.27431 176.15334 181.17195 184.90359 189.78264 193.51212 199.68216 205.85033 210.72935 216.89752"
              y="215.28"
-             x="165.10014 171.27431 176.15334 181.17195 184.90359 189.78264 193.51212 199.68216 205.85033 210.72935 216.89752">basic-event</tspan><tspan
-             id="tspan100"
+             id="tspan98">basic-event</tspan><tspan
+             x="163.95857 170.12674 176.29491 182.31963 187.33824 192.21727 195.94676 202.11681 208.28496 213.164 219.33217"
              y="199.8"
-             x="163.95857 170.12674 176.29491 182.31963 187.33824 192.21727 195.94676 202.11681 208.28496 213.164 219.33217">house-event</tspan><tspan
-             id="tspan102"
+             id="tspan100">house-event</tspan><tspan
+             x="165.10614 171.27431 176.15334 179.88498"
              y="184.44"
-             x="165.10614 171.27431 176.15334 179.88498">gate</tspan><tspan
-             id="tspan104"
+             id="tspan102">gate</tspan><tspan
+             x="165.10614 170.12862 176.15334 186.04716 192.22131 198.38948 204.55765 209.43668 215.60484"
              y="169.08"
-             x="165.10614 170.12862 176.15334 186.04716 192.22131 198.38948 204.55765 209.43668 215.60484">component</tspan><tspan
-             id="tspan106"
+             id="tspan104">component</tspan><tspan
+             x="165.10614 168.83562 173.71466 179.88283 183.61447 187.34612 191.07559 194.66379 198.39328 203.41576"
              y="123"
-             x="165.10614 168.83562 173.71466 179.88283 183.61447 187.34612 191.07559 194.66379 198.39328 203.41576">fault-tree</tspan><tspan
-             id="tspan108"
+             id="tspan106">fault-tree</tspan><tspan
+             x="165.10614 173.713 181.17227 187.33856 191.06805 197.23622 200.82225 206.99042 213.15256"
              y="153.72"
-             x="165.10614 173.713 181.17227 187.33856 191.06805 197.23622 200.82225 206.99042 213.15256">CCF-group</tspan><tspan
-             id="tspan110"
+             id="tspan108">CCF-group</tspan><tspan
+             x="165.10614 170.12476 176.14349 182.31764 186.04524 189.7769 193.50854 197.24019 203.40836 206.99655 210.7282 216.89636"
              y="138.36"
-             x="165.10614 170.12476 176.14349 182.31764 186.04524 189.7769 193.50854 197.24019 203.40836 206.99655 210.7282 216.89636">substitution</tspan><tspan
-             id="tspan112"
+             id="tspan110">substitution</tspan><tspan
+             x="165.10016 171.27431 175.00378 179.88283 186.05099 192.22104"
              y="107.64"
-             x="165.10016 171.27431 175.00378 179.88283 186.05099 192.22104">branch</tspan><tspan
-             id="tspan114"
+             id="tspan112">branch</tspan><tspan
+             x="165.10614 170.12476 175.00378 181.17195 187.34012 193.51016 199.67833 204.55736"
              y="92.279999"
-             x="165.10614 170.12476 175.00378 181.17195 187.34012 193.51016 199.67833 204.55736">sequence</tspan><tspan
-             id="tspan116"
+             id="tspan114">sequence</tspan><tspan
+             x="165.10614 168.83562 175.00378 181.17195 186.05099 189.78264 193.51428 199.68245 205.85062 212.02066 215.60886 219.33833 224.36081 230.52898 235.40802 242.72374"
              y="76.919998"
-             x="165.10614 168.83562 175.00378 181.17195 186.05099 189.78264 193.51428 199.68245 205.85062 212.02066 215.60886 219.33833 224.36081 230.52898 235.40802 242.72374">functional-event</tspan><tspan
-             id="tspan118"
+             id="tspan116">functional-event</tspan><tspan
+             x="163.95857 167.54677 173.71494 177.44658 181.17822 184.90987 189.78891 193.52055 197.2522 203.42036 209.44508 213.17456 218.19704 224.3652 230.53525 236.70341"
              y="61.560001"
-             x="163.95857 167.54677 173.71494 177.44658 181.17822 184.90987 189.78891 193.52055 197.2522 203.42036 209.44508 213.17456 218.19704 224.3652 230.53525 236.70341">initiating-event</tspan><tspan
-             id="tspan120"
+             id="tspan118">initiating-event</tspan><tspan
+             x="163.95857 167.54677 173.71494 177.44658 181.17822 184.90987 189.78891 193.52055 197.2522 203.42036 209.44508 213.17456 218.19704 224.3652 230.53525 236.70341 240.29161 244.0211 250.18927 253.91875 260.08691 266.24905"
              y="46.080002"
-             x="163.95857 167.54677 173.71494 177.44658 181.17822 184.90987 189.78891 193.52055 197.2522 203.42036 209.44508 213.17456 218.19704 224.3652 230.53525 236.70341 240.29161 244.0211 250.18927 253.91875 260.08691 266.24905">initiating-event-group</tspan><tspan
-             id="tspan122"
+             id="tspan120">initiating-event-group</tspan><tspan
+             x="165.10614 168.83562 175.00378 178.73543"
              y="30.719999"
-             x="165.10614 168.83562 175.00378 178.73543">rule</tspan><tspan
-             id="tspan124"
+             id="tspan122">rule</tspan><tspan
+             x="163.95857 168.8376 175.00577 181.17581 187.34398 191.07562 194.66167 198.39331 202.12279 207.00182"
              y="15.36"
-             x="163.95857 168.8376 175.00577 181.17581 187.34398 191.07562 194.66167 198.39331 202.12279 207.00182">event-tree</tspan><tspan
-             id="tspan126"
+             id="tspan124">event-tree</tspan><tspan
+             x="162.66756 171.27637 175.00801 179.88318 183.61078 187.34242 193.51059"
              y="-30.719999"
-             x="162.66756 171.27637 175.00801 179.88318 183.61078 187.34242 193.51059">mission</tspan><tspan
-             id="tspan128"
+             id="tspan126">mission</tspan><tspan
+             x="163.95857 168.8376 175.00577 182.3215 186.0491 192.21915 198.38731 204.55548 209.43451 215.60268 221.77272 226.79521 230.52469 236.69286 240.27888 246.44705 252.60921"
              y="-15.36"
-             x="163.95857 168.8376 175.00577 182.3215 186.0491 192.21915 198.38731 204.55548 209.43451 215.60268 221.77272 226.79521 230.52469 236.69286 240.27888 246.44705 252.60921">consequence-group</tspan></text>
+             id="tspan128">consequence-group</tspan></text>
 </g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g130"><path
-           id="path132"
+         id="g130"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4768.87 814.57,-248.74"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4768.87 814.57,-248.74" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g134"><path
-           id="path136"
+           id="path132" /></g><g
+         id="g134"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 814.57,-137.41"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 814.57,-137.41" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g138"><path
-           id="path140"
+           id="path136" /></g><g
+         id="g138"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 814.57,0"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 814.57,0" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g142"><path
-           id="path144"
+           id="path140" /></g><g
+         id="g142"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 822.55,128.38"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 822.55,128.38" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g146"><path
-           id="path148"
+           id="path144" /></g><g
+         id="g146"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 822.55,256.76"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 822.55,256.76" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g150"><path
-           id="path152"
+           id="path148" /></g><g
+         id="g150"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4768.87 822.55,394.18"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4768.87 822.55,394.18" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g154"><path
-           id="path156"
+           id="path152" /></g><g
+         id="g154"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 822.55,513.53"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 822.55,513.53" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g158"><path
-           id="path160"
+           id="path156" /></g><g
+         id="g158"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 814.57,1019.03"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 814.57,1019.03" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g162"><path
-           id="path164"
+           id="path160" /></g><g
+         id="g162"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 814.57,1156.44"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 814.57,1156.44" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g166"><path
-           id="path168"
+           id="path164" /></g><g
+         id="g166"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4759.84 822.55,1284.83"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-4759.84 822.55,1284.83" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g170"><path
-           id="path172"
+           id="path168" /></g><g
+         id="g170"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1837.53,-4246.31 813.58,-256.77"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1837.53,-4246.31 813.58,-256.77" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g174"><path
-           id="path176"
+           id="path172" /></g><g
+         id="g174"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4246.31 814.57,-128.38"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-4246.31 814.57,-128.38" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g178"><path
-           id="path180"
+           id="path176" /></g><g
+         id="g178"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4246.31 822.55,0"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-4246.31 822.55,0" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g182"><path
-           id="path184"
+           id="path180" /></g><g
+         id="g182"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4246.31 822.55,128.38"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-4246.31 822.55,128.38" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g186"><path
-           id="path188"
+           id="path184" /></g><g
+         id="g186"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4246.31 814.57,248.74"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-4246.31 814.57,248.74" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g190"><path
-           id="path192"
+           id="path188" /></g><g
+         id="g190"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-4246.31 814.57,385.15"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-4246.31 814.57,385.15" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g194"><path
-           id="path196"
+           id="path192" /></g><g
+         id="g194"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3732.78 814.57,137.41"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3732.78 814.57,137.41" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g198"><path
-           id="path200"
+           id="path196" /></g><g
+         id="g198"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1820.58,-3732.78 822.55,257.77"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1820.58,-3732.78 822.55,257.77" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g202"><path
-           id="path204"
+           id="path200" /></g><g
+         id="g202"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3732.78 822.55,386.15"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3732.78 822.55,386.15" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g206"><path
-           id="path208"
+           id="path204" /></g><g
+         id="g206"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1820.58,-3732.78 830.53,514.53"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1820.58,-3732.78 830.53,514.53" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g210"><path
-           id="path212"
+           id="path208" /></g><g
+         id="g210"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1820.58,-3732.78 822.55,642.91"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1820.58,-3732.78 822.55,642.91" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g214"><path
-           id="path216"
+           id="path212" /></g><g
+         id="g214"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1820.58,-3732.78 822.55,763.27"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1820.58,-3732.78 822.55,763.27" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g218"><path
-           id="path220"
+           id="path216" /></g><g
+         id="g218"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1820.58,-3732.78 822.55,899.68"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1820.58,-3732.78 822.55,899.68" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g222"><path
-           id="path224"
+           id="path220" /></g><g
+         id="g222"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3227.28 814.57,-376.12"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3227.28 814.57,-376.12" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g226"><path
-           id="path228"
+           id="path224" /></g><g
+         id="g226"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3218.25 814.57,-256.76"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3218.25 814.57,-256.76" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g230"><path
-           id="path232"
+           id="path228" /></g><g
+         id="g230"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1837.53,-3218.25 813.58,-128.38"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1837.53,-3218.25 813.58,-128.38" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g234"><path
-           id="path236"
+           id="path232" /></g><g
+         id="g234"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1837.53,-3218.25 813.58,0"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1837.53,-3218.25 813.58,0" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g238"><path
-           id="path240"
+           id="path236" /></g><g
+         id="g238"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3218.25 814.57,128.38"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3218.25 814.57,128.38" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g242"><path
-           id="path244"
+           id="path240" /></g><g
+         id="g242"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3210.23 814.57,248.74"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3210.23 814.57,248.74" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g246"><path
-           id="path248"
+           id="path244" /></g><g
+         id="g246"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-3210.23 814.57,369.1"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:17.129, 17.129, 0, 17.129;stroke-dashoffset:0;stroke-opacity:1"
-           d="m 1828.56,-3210.23 814.57,369.1" /></g><g
-         transform="scale(8.33333,8.33333)"
-         id="g250"><text
-           id="text252"
+           id="path248" /></g><g
+         id="g250"
+         transform="scale(8.33333,8.33333)"><text
+           transform="matrix(0.836553,0,0,-1,324.36,569.48)"
            style="font-variant:normal;font-weight:normal;font-size:12.29759979px;font-family:'Times New Roman';-inkscape-font-specification:TimesNewRoman;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-           transform="matrix(0.836553,0,0,-1,324.36,569.48)"><tspan
-             id="tspan254"
+           id="text252"><tspan
+             x="0 4.8790321 11.047199 18.362932 22.090538 28.260582 34.428749 40.596916 45.475948 51.644112 57.814156"
              y="0"
-             x="0 4.8790321 11.047199 18.362932 22.090538 28.260582 34.428749 40.596916 45.475948 51.644112 57.814156">consequence</tspan><tspan
-             id="tspan256"
+             id="tspan254">consequence</tspan><tspan
+             x="-194.799 -186.1902 -180.02203 -173.85387 -167.68382 -163.95216 -160.22266 -154.05449 -149.17546 -145.4438"
              y="227.52"
-             x="-194.799 -186.1902 -180.02203 -173.85387 -167.68382 -163.95216 -160.22266 -154.05449 -149.17546 -145.4438">model-data</tspan></text>
+             id="tspan256">model-data</tspan></text>
 </g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g258"><path
-           id="path260"
+         id="g258"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-2858.18 822.55,-231.69"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-2858.18 822.55,-231.69" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g262"><path
-           id="path264"
+           id="path260" /></g><g
+         id="g262"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-2858.18 822.55,-103.31"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-2858.18 822.55,-103.31" /></g><g
-         transform="scale(1.00298,-0.997023)"
-         id="g266"><path
-           id="path268"
+           id="path264" /></g><g
+         id="g266"
+         transform="scale(1.00298,-0.997023)"><path
+           d="m 1828.56,-2858.18 796.62,25.08"
            style="fill:none;stroke:#000000;stroke-width:8.56449986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-           d="m 1828.56,-2858.18 796.62,25.08" /></g></g></g></svg>
\ No newline at end of file
+           id="path268" /></g><path
+         id="path4614"
+         d="M 2664.8107,5134.2181 1826.1523,4758.6105"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6.66666603px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><g
+         style="display:inline"
+         id="layer2"><g
+           clip-path="url(#clipPath4682)"
+           id="g250-4"
+           transform="matrix(8.3333333,0,0,8.3333333,1344.229,2281.918)"
+           style="display:inline"><text
+             transform="matrix(0.836553,0,0,-1,324.36,569.48)"
+             style="font-variant:normal;font-weight:normal;font-size:12.29759979px;font-family:'Times New Roman';-inkscape-font-specification:TimesNewRoman;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="text252-9"><tspan
+               x="0 4.8790321 11.047199 18.362932 22.090538 28.260582 34.428749 40.596916 45.475948 51.644112 57.814156"
+               y="0"
+               id="tspan254-5">consequence</tspan><tspan
+               x="-194.799 -186.1902 -180.02203 -173.85387 -167.68382 -163.95216 -160.22266 -154.05449 -149.17546 -145.4438"
+               y="227.52"
+               id="tspan256-0">model-data</tspan></text>
+</g></g><rect
+         transform="scale(1,-1)"
+         y="-2936.4729"
+         x="1331.2789"
+         height="110.66668"
+         width="404.17392"
+         id="rect4652"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g></svg>
\ No newline at end of file
diff --git a/mef/schema/model.rnc b/mef/schema/model.rnc
index f9d86b2..0fd16fd 100644
--- a/mef/schema/model.rnc
+++ b/mef/schema/model.rnc
@@ -3,7 +3,8 @@ model =
     name?,
     label?,
     attributes?,
-    (event-tree-definition
+    (model-data
+     |event-tree-definition
      | alignment-definition
      | consequence-group-definition
      | consequence-definition
@@ -14,5 +15,4 @@ model =
      | substitution-definition
      | CCF-group-definition
      | include-directive)*,
-    model-data?
   }