23 files changed, 1208 insertions, 1348 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
index a345989..0329450 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
index a597a91..a384877 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
index 6bd35d4..c30dcfd 100755
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
index 10984da..1367d32 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
index 8f18afc..12e45f9 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
index 791f542..2977524 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg
index d933a63..86f4d12 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="trgt.svg"
-   inkscape:export-filename="L:\docu_work\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\trgt.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt.png"
    inkscape:export-xdpi="65"
    inkscape:export-ydpi="65">
   <defs
@@ -522,13 +520,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.62"
-     inkscape:cx="560.05537"
-     inkscape:cy="285.57838"
+     inkscape:cx="510.81788"
+     inkscape:cy="354.91926"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -539,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -590,9 +589,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -611,9 +610,9 @@
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
@@ -698,7 +697,7 @@
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -706,32 +705,30 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
     </g>
@@ -752,20 +749,16 @@
            height="25.079741"
            x="872"
            y="137.70079" /></flowRegion><flowPara
-         id="flowPara955" /></flowRoot>    <text
+         id="flowPara955" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="253.30237"
        y="127.42318"
-       id="text947"><tspan
-         sodipodi:role="line"
-         id="tspan945"
-         x="253.30237"
-         y="133.14297"
-         style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332" /></text>
+       id="text947" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
        x="77.070297"
        y="140.22328"
        id="text4180-4"><tspan
@@ -773,7 +766,7 @@
          id="tspan4178-0"
          x="77.070297"
          y="140.22328"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
        d="m 266.39304,242.05073 -5.00906,-38.32387"
@@ -797,45 +790,40 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       transform="translate(229.03004,198.99263)"
-       id="g6108">
-      <g
-         id="g1117"
-         transform="translate(0,-6.3500003)">
-        <rect
-           style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1"
-           id="rect5992"
-           width="54.967422"
-           height="32.516785"
-           x="8.4991493"
-           y="49.31292"
-           rx="5.9960117" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="35.614925"
-           y="62.470726"
-           id="text5996"><tspan
-             sodipodi:role="line"
-             id="tspan5994"
-             x="35.614925"
-             y="62.470726"
-             style="stroke-width:0.26458332">uCPE</tspan><tspan
-             sodipodi:role="line"
-             x="35.614925"
-             y="73.054062"
-             style="stroke-width:0.26458332"
-             id="tspan5998">Manager</tspan></text>
-      </g>
+       id="g222">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1"
+         id="rect5992"
+         width="54.967422"
+         height="32.516785"
+         x="237.52919"
+         y="241.95555"
+         rx="5.9960117" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="264.72488"
+         y="255.32437"
+         id="text5996"><tspan
+           sodipodi:role="line"
+           x="264.72488"
+           y="255.32437"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan5998">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="265.80304"
+           y="265.02576"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan216">Management </tspan></text>
     </g>
     <rect
        style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53169465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.06338919, 0.53169459, 0.2658473, 0.53169459;stroke-dashoffset:0;stroke-opacity:1"
@@ -855,19 +843,19 @@
        rx="7.1185279" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="262.7706"
        y="132.16495"
        id="text6054"><tspan
          sodipodi:role="line"
          x="263.74899"
          y="132.16495"
-         style="font-size:7.05555534px;stroke-width:0.26458332"
+         style="font-size:7.05556px;stroke-width:0.264583"
          id="tspan1505">Web Interface </tspan><tspan
          sodipodi:role="line"
          x="262.7706"
          y="142.74828"
-         style="font-size:4.23333311px;line-height:0;stroke-width:0.26458332"
+         style="font-size:4.23333px;line-height:0;stroke-width:0.264583"
          id="tspan2650">(128T) https://&lt;IP&gt;:60001</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
@@ -888,7 +876,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="200.812"
          y="197.64984"
          id="text892-8"><tspan
@@ -896,7 +884,7 @@
            id="tspan890-8"
            x="200.812"
            y="197.64984"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">ibm_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">ibm_br</tspan></text>
     </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -917,7 +905,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="97.733612"
          y="178.01437"
          id="text892-8-9-5"><tspan
@@ -925,7 +913,7 @@
            id="tspan890-8-6-4"
            x="97.733612"
            y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lan_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lan_br</tspan></text>
     </g>
     <g
        id="g2592"
@@ -1022,24 +1010,14 @@
              style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
           <text
              xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+             style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
              x="53.59409"
              y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+             id="text15008-4" />
         </g>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
            x="12.285738"
            y="179.02138"
            id="text4180"><tspan
@@ -1047,7 +1025,7 @@
              id="tspan4178"
              x="12.285738"
              y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
       </g>
     </g>
     <rect
@@ -1076,9 +1054,9 @@
            id="text892-8-9"
            y="233.89996"
            x="146.69841"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
            xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
              y="233.89996"
              x="146.69841"
              id="tspan890-8-6"
@@ -1106,35 +1084,30 @@
          id="g2216">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="152.78181"
            y="190.09128"
            id="text5981"><tspan
              sodipodi:role="line"
              x="152.78181"
              y="190.09128"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
              id="tspan5983">128T</tspan></text>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="153.08981"
            y="198.8871"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
-             id="tspan5983-0" /></text>
+           id="text5981-9" />
       </g>
     </g>
     <text
        id="text892-8-9-5-5"
        y="178.40254"
        x="130.10648"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="178.40254"
          x="130.10648"
          id="tspan890-8-6-4-2"
@@ -1143,9 +1116,9 @@
        id="text892-8-9-5-5-7"
        y="197.8927"
        x="173.88567"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="197.8927"
          x="173.88567"
          id="tspan890-8-6-4-2-5"
@@ -1154,9 +1127,9 @@
        id="text892-8-9-5-5-7-6"
        y="209.60852"
        x="152.23137"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="209.60852"
          x="152.23137"
          id="tspan890-8-6-4-2-5-4"
@@ -1190,7 +1163,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.01842"
        y="227.15002"
        id="text2695"><tspan
@@ -1198,10 +1171,10 @@
          id="tspan2693"
          x="150.01842"
          y="227.15002"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.09465"
        y="214.73219"
        id="text2695-7"><tspan
@@ -1209,10 +1182,10 @@
          id="tspan2693-9"
          x="150.09465"
          y="214.73219"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="123.06345"
        y="175.89812"
        id="text2695-5"><tspan
@@ -1220,10 +1193,10 @@
          id="tspan2693-95"
          x="123.06345"
          y="175.89812"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="53.247215"
        y="176.16252"
        id="text2695-7-0"><tspan
@@ -1231,10 +1204,10 @@
          id="tspan2693-9-4"
          x="53.247215"
          y="176.16252"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="101.91634"
        y="171.6506"
        id="text2770"><tspan
@@ -1242,10 +1215,10 @@
          id="tspan2768"
          x="101.91634"
          y="171.6506"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">192.168.64.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">192.168.64.0/24</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="141.07509"
        y="221.29282"
        id="text2770-0"><tspan
@@ -1253,6 +1226,6 @@
          id="tspan2768-4"
          x="141.07509"
          y="221.29282"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
   </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
index da0824d..7cb5af0 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg
index 931bcaf..4bd6d85 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,8 +13,11 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="trgt_servicechain.svg">
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="trgt_servicechain.svg"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt_servicechain.png"
+   inkscape:export-xdpi="65"
+   inkscape:export-ydpi="65">
   <defs
      id="defs1119">
     <marker
@@ -518,14 +519,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.58"
-     inkscape:cx="375.51558"
-     inkscape:cy="323.25547"
+     inkscape:zoom="0.82024387"
+     inkscape:cx="392.43009"
+     inkscape:cy="234.25387"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -536,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -569,7 +571,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="Template Pieces"
-     style="display:inline"
+     style="display:none"
      transform="translate(-1.4460939,-31.103178)">
     <g
        transform="translate(-347.67938,189.67391)"
@@ -581,14 +583,14 @@
          height="18"
          width="45"
          id="rect6062"
-         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
+         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
       <text
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -601,26 +603,26 @@
        height="59.711037"
        width="19.975622"
        id="rect6098"
-       style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.28896147;stroke-opacity:1" />
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.288961;stroke-opacity:1" />
     <text
        transform="rotate(90)"
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
          sodipodi:role="line">OVS Bridge</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000003, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="m -149.19921,310.00051 h 34.52812"
        id="path8471"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000004, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M -104.61691,328.32292 V 293.7948"
        id="path8471-3"
        inkscape:connector-curvature="0" />
@@ -635,37 +637,37 @@
        id="path8471-3-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
        d="m -142.20667,270.65304 h 37.32518"
        id="path6121"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
        d="m -142.15413,276.6677 h 37.32519"
        id="path6121-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
        d="m -99.555704,258.89146 21.35958,30.60942"
        id="path6121-4-7"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
        d="m -53.814264,258.73079 -21.35958,30.60942"
        id="path6121-4-7-5"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
        d="m -77.254954,275.59103 -21.35958,-30.60942"
        id="path6121-4-7-3-6"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
+       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
        d="m -144.36842,344.40951 h 22.4813"
        id="path899"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
+       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
        d="m -113.08989,344.13177 h 22.481306"
        id="path899-9"
        inkscape:connector-curvature="0" />
@@ -688,13 +690,13 @@
            inkscape:connector-curvature="0" />
         <path
            transform="translate(-3.1511298,-3.7216363)"
-           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.59490627;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
+           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.594906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
            d="m 108.80427,115.85976 h 10.92006"
            id="path899-9-2"
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -702,39 +704,37 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="307.47116"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="330.80453"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="354.13791"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="377.47128"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="400.80466"
              id="tspan4342" /></text>
       </g>
     </g>
     <g
        transform="translate(-414.95854,87.627341)"
        id="g1489-5"
-       style="stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728">
+       style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-opacity:1">
       <rect
          rx="6.4529891"
          y="118.30851"
@@ -742,18 +742,13 @@
          height="29.760508"
          width="51.623913"
          id="rect6039-1"
-         style="fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
+         style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
       <text
          id="text6054-9"
          y="127.71474"
          x="262.66827"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           id="tspan1479-0"
-           style="font-size:8.46666667px;line-height:5px;stroke-width:0.26458332;stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728"
-           y="132.54945"
-           x="262.66827"
-           sodipodi:role="line" /></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.264583;stroke-opacity:1"
+         xml:space="preserve" />
     </g>
   </g>
   <g
@@ -761,685 +756,647 @@
      id="layer2"
      inkscape:label="Trgt Schema"
      transform="translate(-1.4460939,-118.10318)">
-    <g
-       id="g2821">
-      <flowRoot
-         transform="matrix(0.26458333,0,0,0.26458333,0,87)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-         id="flowRoot949"
-         xml:space="preserve"><flowRegion
-           id="flowRegion951"><rect
-             y="137.70079"
-             x="872"
-             height="25.079741"
-             width="201.71744"
-             id="rect953" /></flowRegion><flowPara
-           id="flowPara955" /></flowRoot>      <text
-         id="text947"
-         y="127.42318"
-         x="253.30237"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="133.14297"
-           x="253.30237"
-           id="tspan945"
-           sodipodi:role="line" /></text>
-      <text
-         id="text4180-4"
+    <flowRoot
+       transform="matrix(0.26458333,0,0,0.26458333,0,87)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot949"
+       xml:space="preserve"><flowRegion
+         id="flowRegion951"><rect
+           y="137.70079"
+           x="872"
+           height="25.079741"
+           width="201.71744"
+           id="rect953" /></flowRegion><flowPara
+         id="flowPara955" /></flowRoot>
+    <text
+       id="text947"
+       y="127.42318"
+       x="253.30237"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve" />
+    <text
+       id="text4180-4"
+       y="140.75244"
+       x="-26.646427"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
          y="140.75244"
          x="-26.646427"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
-           y="140.75244"
-           x="-26.646427"
-           id="tspan4178-0"
-           sodipodi:role="line">uCPE Device</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9"
-         d="m 266.39304,242.05073 -5.00906,-38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9-0"
-         d="m 268.53365,148.2789 -5.00906,38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000002, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5091-2"
-         d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.19981423;stroke-opacity:1;filter:url(#filter4332-6)" />
-      <text
-         id="text6011-4"
+         id="tspan4178-0"
+         sodipodi:role="line">uCPE Device</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9"
+       d="m 266.39304,242.05073 -5.00906,-38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9-0"
+       d="m 268.53365,148.2789 -5.00906,38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5091-2"
+       d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.199814;stroke-opacity:1;filter:url(#filter4332-6)" />
+    <text
+       id="text6011-4"
+       y="198.60991"
+       x="263.42371"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-6)"
+       xml:space="preserve"><tspan
+         style="font-size:7.05556px;stroke-width:0.264583"
          y="198.60991"
          x="263.42371"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-6)"
-         xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
-           y="198.60991"
-           x="263.42371"
-           id="tspan6009-5"
-           sodipodi:role="line">Internet</tspan></text>
-      <g
-         id="g6108"
-         transform="translate(229.03004,198.99263)">
-        <g
-           transform="translate(0,-6.3500003)"
-           id="g1117">
-          <rect
-             rx="5.9960117"
-             y="49.31292"
-             x="8.4991493"
-             height="32.516785"
-             width="54.967422"
-             id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1" />
-          <text
-             id="text5996"
-             y="62.470726"
-             x="35.614925"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               style="stroke-width:0.26458332"
-               y="62.470726"
-               x="35.614925"
-               id="tspan5994"
-               sodipodi:role="line">uCPE</tspan><tspan
-               id="tspan5998"
-               style="stroke-width:0.26458332"
-               y="73.054062"
-               x="35.614925"
-               sodipodi:role="line">Manager</tspan></text>
-        </g>
-      </g>
+         id="tspan6009-5"
+         sodipodi:role="line">Internet</tspan></text>
+    <g
+       id="g376">
       <rect
-         rx="16.325657"
-         y="144.03362"
-         x="-26.00753"
-         height="101.71231"
-         width="255.02283"
-         id="rect2700"
-         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.68559104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118189, 0.68559094, 0.34279548, 0.68559094;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64"
-         d="m 115.10448,236.3616 90.22324,-35.73878"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <g
-         transform="translate(4.2333335,1.1204851e-6)"
-         id="g2676">
-        <rect
-           rx="2.0431714"
-           y="188.76456"
-           x="-200.64168"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8"
-           y="197.64984"
-           x="200.812"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="197.64984"
-             x="200.812"
-             id="tspan890-8"
-             sodipodi:role="line">ibm_br</tspan></text>
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3"
-         d="m 77.127442,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         rx="5.9960117"
+         y="241.95555"
+         x="237.52919"
+         height="32.516785"
+         width="54.967422"
+         id="rect5992"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1" />
+      <text
+         id="text5996"
+         y="255.32437"
+         x="264.72488"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         xml:space="preserve"><tspan
+           id="tspan5998"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="255.32437"
+           x="264.72488"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="265.02576"
+           x="265.80304"
+           sodipodi:role="line"
+           id="tspan370">Management </tspan></text>
+    </g>
+    <rect
+       rx="16.325657"
+       y="144.03362"
+       x="-26.00753"
+       height="101.71231"
+       width="255.02283"
+       id="rect2700"
+       style="vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.685591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118, 0.685591, 0.342795, 0.685591;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64"
+       d="m 115.10448,236.3616 90.22324,-35.73878"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="translate(4.2333335)"
+       id="g2676">
       <rect
-         transform="rotate(-90)"
-         style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-         id="rect6098-9-6-2"
-         width="8.1726856"
+         rx="2.0431714"
+         y="188.76456"
+         x="-200.64168"
          height="24.429752"
-         x="-181.00621"
-         y="89.828568"
-         rx="2.0431714" />
+         width="8.1726856"
+         id="rect6098-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
       <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         id="text892-8"
+         y="197.64984"
+         x="200.812"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
+           y="197.64984"
+           x="200.812"
+           id="tspan890-8"
+           sodipodi:role="line">ibm_br</tspan></text>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3"
+       d="m 77.127442,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+       id="rect6098-9-6-2"
+       width="8.1726856"
+       height="24.429752"
+       x="-181.00621"
+       y="89.828568"
+       rx="2.0431714" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="101.88118"
+       y="178.01437"
+       id="text892-8-9-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4"
          x="101.88118"
          y="178.01437"
-         id="text892-8-9-5"><tspan
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lsfc_br</tspan></text>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="125.00951"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977"
+       style="fill:#72b500;fill-opacity:0.839216;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-1.5662411,-4.5514539)"
+       id="g2216">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.00713"
+         y="180.28951"
+         id="text5981" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.51656"
+         y="193.33939"
+         id="text5981-9"><tspan
            sodipodi:role="line"
-           id="tspan890-8-6-4"
-           x="101.88118"
-           y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lsfc_br</tspan></text>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="125.00951"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977"
-         style="fill:#72b500;fill-opacity:0.8392157;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-1.5662411,-4.5514539)"
-         id="g2216">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.00713"
-           y="180.28951"
-           id="text5981"><tspan
-             sodipodi:role="line"
-             x="153.00713"
-             y="187.91589"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983" /></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
            x="153.51656"
            y="193.33939"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.51656"
-             y="193.33939"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0">128T</tspan></text>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-0">128T</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="130.10648"
+       y="178.40254"
+       id="text892-8-9-5-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2"
          x="130.10648"
          y="178.40254"
-         id="text892-8-9-5-5"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2"
-           x="130.10648"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="173.88567"
+       y="197.8927"
+       id="text892-8-9-5-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5"
          x="173.88567"
          y="197.8927"
-         id="text892-8-9-5-5-7"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5"
-           x="173.88567"
-           y="197.8927"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="152.23137"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4"
          x="152.23137"
          y="209.60852"
-         id="text892-8-9-5-5-7-6"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4"
-           x="152.23137"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1"
-         d="m 114.43454,176.90997 h 10.528"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-3"
-         d="m 179.82558,196.6529 h 13.128"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-6-0"
-         d="m 217.53236,196.67 h 21.928"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="192.75043"
-         x="227.74036"
-         height="7.845396"
-         width="2.5537291"
-         id="rect2227-5"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.3275212;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1"
+       d="m 114.43454,176.90997 h 10.528"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-3"
+       d="m 179.82558,196.6529 h 13.128"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-6-0"
+       d="m 217.53236,196.67 h 21.928"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="192.75043"
+       x="227.74036"
+       height="7.845396"
+       width="2.5537291"
+       id="rect2227-5"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.327521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7"
+       y="214.73219"
+       x="150.09465"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="150.09465"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="150.09465"
-           id="tspan2693-9"
-           sodipodi:role="line">.2</tspan></text>
-      <text
-         id="text2695-5"
+         id="tspan2693-9"
+         sodipodi:role="line">.2</tspan></text>
+    <text
+       id="text2695-5"
+       y="175.89812"
+       x="123.06345"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="123.06345"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="123.06345"
-           id="tspan2693-95"
-           sodipodi:role="line">.1</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-14"
-         d="m -25.47561,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="172.71829"
-         x="-27.148451"
-         height="7.9598031"
-         width="2.5477617"
-         id="rect2227"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.32951498;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-95"
+         sodipodi:role="line">.1</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-14"
+       d="m -25.47561,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="172.71829"
+       x="-27.148451"
+       height="7.9598031"
+       width="2.5477617"
+       id="rect2227"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.329515;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g1660">
       <g
-         id="g1660">
+         id="g2177"
+         transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
         <g
-           id="g2177"
-           transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
+           id="g2160">
+          <path
+             style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 14.089065,261.95608 h 48.428"
+             id="path8471-3-2-4-2"
+             inkscape:connector-curvature="0" />
           <g
-             id="g2160">
-            <path
-               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-               d="m 14.089065,261.95608 h 48.428"
-               id="path8471-3-2-4-2"
-               inkscape:connector-curvature="0" />
+             id="g2136"
+             transform="translate(-0.08009955)">
             <g
-               id="g2136"
-               transform="translate(-0.08009955)">
+               id="g2102">
               <g
-                 id="g2102">
-                <g
-                   id="g2086">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
-              </g>
-              <g
-                 id="g2102-4"
-                 transform="translate(-23.633146)">
-                <g
-                   id="g2086-8">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9-0"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6-3"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
+                 id="g2086">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
               </g>
             </g>
-          </g>
-          <g
-             id="g2102-9"
-             transform="rotate(180,44.251401,261.95726)">
             <g
-               id="g2086-4">
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path8471-3-2-4-2-9-7"
-                 d="m 50.199738,174.82006 v 4.928"
-                 style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                 transform="translate(0,87)" />
-              <rect
-                 y="266.31744"
-                 x="42.699738"
-                 height="15"
-                 width="15"
-                 id="rect1948-6-4"
-                 style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+               id="g2102-4"
+               transform="translate(-23.633146)">
+              <g
+                 id="g2086-8">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9-0"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6-3"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+              </g>
             </g>
           </g>
         </g>
         <g
-           style="fill:#ac9d93;filter:url(#filter4332)"
-           id="g6108-0"
-           transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
-          <rect
-             rx="6.0006089"
-             y="49.061516"
-             x="8.1325779"
-             height="24.0366"
-             width="55.009563"
-             id="rect5992-4"
-             style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             x="53.59409"
-             y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+           id="g2102-9"
+           transform="rotate(180,44.251401,261.95726)">
+          <g
+             id="g2086-4">
+            <path
+               inkscape:connector-curvature="0"
+               id="path8471-3-2-4-2-9-7"
+               d="m 50.199738,174.82006 v 4.928"
+               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               transform="translate(0,87)" />
+            <rect
+               y="266.31744"
+               x="42.699738"
+               height="15"
+               width="15"
+               id="rect1948-6-4"
+               style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          </g>
         </g>
+      </g>
+      <g
+         style="fill:#ac9d93;filter:url(#filter4332)"
+         id="g6108-0"
+         transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
+        <rect
+           rx="6.0006089"
+           y="49.061516"
+           x="8.1325779"
+           height="24.0366"
+           width="55.009563"
+           id="rect5992-4"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           x="53.59409"
+           y="60.119961"
+           id="text15008-4" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
+         x="12.285738"
+         y="179.02138"
+         id="text4180"
+         transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
+           sodipodi:role="line"
+           id="tspan4178"
            x="12.285738"
            y="179.02138"
-           id="text4180"
-           transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
-             sodipodi:role="line"
-             id="tspan4178"
-             x="12.285738"
-             y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.29981196;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.59962392, 0.29981196, 0.14990598, 0.29981196;stroke-dashoffset:0;stroke-opacity:1"
-           d="m -33.356642,176.91944 h 6.319277"
-           id="path8471-3-6-0-7"
-           inkscape:connector-curvature="0" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
+      <path
+         style="display:inline;fill:none;stroke:#000000;stroke-width:0.299812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.599624, 0.299812, 0.149906, 0.299812;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -33.356642,176.91944 h 6.319277"
+         id="path8471-3-6-0-7"
+         inkscape:connector-curvature="0" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+         x="-47.92791"
+         y="176.02995"
+         id="text2695-7-0"
+         transform="scale(0.99924797,1.0007526)"><tspan
+           sodipodi:role="line"
+           id="tspan2693-9-4"
            x="-47.92791"
            y="176.02995"
-           id="text2695-7-0"
-           transform="scale(0.99924797,1.0007526)"><tspan
-             sodipodi:role="line"
-             id="tspan2693-9-4"
-             x="-47.92791"
-             y="176.02995"
-             style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747">.2</tspan></text>
-      </g>
-      <text
-         id="text2770"
+           style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417">.2</tspan></text>
+    </g>
+    <text
+       id="text2770"
+       y="171.6506"
+       x="101.91634"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
          x="101.91634"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="101.91634"
-           id="tspan2768"
-           sodipodi:role="line">192.168.64.0/24</tspan></text>
+         id="tspan2768"
+         sodipodi:role="line">192.168.64.0/24</tspan></text>
+    <g
+       transform="translate(12.876938,3.7041668)"
+       id="g1953">
       <g
-         transform="translate(12.876938,3.7041668)"
-         id="g1953">
-        <g
-           id="g2691"
-           transform="translate(-58.125198,-0.52916555)">
-          <rect
-             transform="rotate(-90)"
-             style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.1247495;stroke-opacity:1"
-             id="rect6098-9-6"
-             width="8.1726856"
-             height="27.201187"
-             x="-236.89076"
-             y="133.15155"
-             rx="2.0431714" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-             x="146.69841"
-             y="233.89996"
-             id="text892-8-9"><tspan
-               sodipodi:role="line"
-               id="tspan890-8-6"
-               x="146.69841"
-               y="233.89996"
-               style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">vnf_mgmt_br</tspan></text>
-        </g>
+         id="g2691"
+         transform="translate(-58.125198,-0.52916555)">
+        <rect
+           transform="rotate(-90)"
+           style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.124749;stroke-opacity:1"
+           id="rect6098-9-6"
+           width="8.1726856"
+           height="27.201187"
+           x="-236.89076"
+           y="133.15155"
+           rx="2.0431714" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+           x="146.69841"
+           y="233.89996"
+           id="text892-8-9"><tspan
+             sodipodi:role="line"
+             id="tspan890-8-6"
+             x="146.69841"
+             y="233.89996"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">vnf_mgmt_br</tspan></text>
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.791451"
+         y="227.15002"
+         id="text2695"><tspan
+           sodipodi:role="line"
+           id="tspan2693"
            x="88.791451"
            y="227.15002"
-           id="text2695"><tspan
-             sodipodi:role="line"
-             id="tspan2693"
-             x="88.791451"
-             y="227.15002"
-             style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.499825"
+         y="221.29282"
+         id="text2770-0"><tspan
+           sodipodi:role="line"
+           id="tspan2768-4"
            x="88.499825"
            y="221.29282"
-           id="text2770-0"><tspan
-             sodipodi:role="line"
-             id="tspan2768-4"
-             x="88.499825"
-             y="221.29282"
-             style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
-      </g>
-      <g
-         transform="translate(-98.455487)"
-         id="g2766-9">
-        <rect
-           rx="2.0431714"
-           y="85.681"
-           x="-181.00621"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9-6-2-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8-9-5-6"
+           style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
+    </g>
+    <g
+       transform="translate(-98.455487)"
+       id="g2766-9">
+      <rect
+         rx="2.0431714"
+         y="85.681"
+         x="-181.00621"
+         height="24.429752"
+         width="8.1726856"
+         id="rect6098-9-6-2-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
+      <text
+         id="text892-8-9-5-6"
+         y="178.01437"
+         x="97.733612"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
            y="178.01437"
            x="97.733612"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="178.01437"
-             x="97.733612"
-             id="tspan890-8-6-4-1"
-             sodipodi:role="line">lan_br</tspan></text>
-      </g>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="22.406458"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977-0"
-         style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-102.85171,17.778478)"
-         id="g2216-0">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="tspan890-8-6-4-1"
+           sodipodi:role="line">lan_br</tspan></text>
+    </g>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="22.406458"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977-0"
+       style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-102.85171,17.778478)"
+       id="g2216-0">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="152.40361"
+         y="171.23683"
+         id="text5981-2"><tspan
+           sodipodi:role="line"
            x="152.40361"
            y="171.23683"
-           id="text5981-2"><tspan
-             sodipodi:role="line"
-             x="152.40361"
-             y="171.23683"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-8">Fortigate</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.08981"
-           y="198.8871"
-           id="text5981-9-6"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0-9" /></text>
-      </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-8">Fortigate</tspan></text>
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.08981"
+         y="198.8871"
+         id="text5981-9-6" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="27.503428"
+       y="178.40254"
+       id="text892-8-9-5-5-8"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-3"
          x="27.503428"
          y="178.40254"
-         id="text892-8-9-5-5-8"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-3"
-           x="27.503428"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="71.282616"
+       y="178.3138"
+       id="text892-8-9-5-5-7-2"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-6"
          x="71.282616"
          y="178.3138"
-         id="text892-8-9-5-5-7-2"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-6"
-           x="71.282616"
-           y="178.3138"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="49.628311"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6-9"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4-4"
          x="49.628311"
          y="209.60852"
-         id="text892-8-9-5-5-7-6-9"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4-4"
-           x="49.628311"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-38"
-         d="M 11.831489,176.90997 H 22.359488"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7-8"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-38"
+       d="M 11.831489,176.90997 H 22.359488"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7-8"
+       y="214.73219"
+       x="47.4916"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="47.4916"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="47.4916"
-           id="tspan2693-9-0"
-           sodipodi:role="line">.3</tspan></text>
-      <text
-         id="text2695-5-2"
+         id="tspan2693-9-0"
+         sodipodi:role="line">.3</tspan></text>
+    <text
+       id="text2695-5-2"
+       y="175.89812"
+       x="20.460402"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="20.460402"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="20.460402"
-           id="tspan2693-95-4"
-           sodipodi:role="line">.1</tspan></text>
-      <text
-         id="text2770-9"
+         id="tspan2693-95-4"
+         sodipodi:role="line">.1</tspan></text>
+    <text
+       id="text2770-9"
+       y="171.6506"
+       x="-0.68670934"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
-         x="-0.68670934"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="-0.68670976"
-           id="tspan2768-8"
-           sodipodi:role="line">172.16.1.0/24</tspan></text>
-      <text
-         transform="scale(0.99924797,1.0007526)"
-         id="text2695-7-0-8"
+         x="-0.6867094"
+         id="tspan2768-8"
+         sodipodi:role="line">172.16.1.0/24</tspan></text>
+    <text
+       transform="scale(0.99924797,1.0007526)"
+       id="text2695-7-0-8"
+       y="176.02995"
+       x="79.167603"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+       xml:space="preserve"><tspan
+         style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417"
          y="176.02995"
          x="79.167603"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
-         xml:space="preserve"><tspan
-           style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747"
-           y="176.02995"
-           x="79.167603"
-           id="tspan2693-9-4-7"
-           sodipodi:role="line">.2</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-5"
-         d="M 87.805429,236.23645 49.787296,211.32258"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-53"
-         d="M 115.00864,236.45949 149.76744,211.266"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-9-4-7"
+         sodipodi:role="line">.2</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-5"
+       d="M 87.805429,236.23645 49.787296,211.32258"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-53"
+       d="M 115.00864,236.45949 149.76744,211.266"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g2693">
       <g
-         id="g2693">
-        <g
-           id="g1489"
-           style="fill:#ab9d92;fill-opacity:0.64313725"
-           transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
-          <rect
-             rx="6.4529891"
-             y="118.30851"
-             x="236.69716"
-             height="29.760508"
-             width="51.623913"
-             id="rect6039"
-             style="fill:#ab9d92;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
-          <text
-             id="text6054"
-             y="127.71474"
-             x="262.66827"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313725;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               id="tspan1479"
-               style="font-size:4.23333311px;line-height:5px;fill:#ab9d92;fill-opacity:0.64313725;stroke-width:0.26458332"
-               y="132.54945"
-               x="262.66827"
-               sodipodi:role="line" /></text>
-        </g>
+         id="g1489"
+         style="fill:#ab9d92;fill-opacity:0.643137"
+         transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
+        <rect
+           rx="6.4529891"
+           y="118.30851"
+           x="236.69716"
+           height="29.760508"
+           width="51.623913"
+           id="rect6039"
+           style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="text6054"
+           y="127.71474"
+           x="262.66827"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="262.49362"
+         y="126.3615"
+         id="text1719"><tspan
+           sodipodi:role="line"
            x="262.49362"
            y="126.3615"
-           id="text1719"><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="126.3615"
-             style="font-size:7.05555534px;writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1727">Web Interface</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="132.63882"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1721" /><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="137.9305"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="143.22215"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
-      </g>
+           style="font-size:7.05556px;writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1727">Web Interface</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="132.63882"
+           id="tspan1721" /><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="137.93048"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="143.22214"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
index 6366b61..97492ca 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg
index 6aafc23..2890881 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    width="1118.8589"
    height="430.20746"
    viewBox="0 0 1118.8589 430.20746"
-   sodipodi:docname="uc_clavister_bridge_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_bridge_new.png"
+   sodipodi:docname="uc_clavister_bridge.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_clavister_bridge.png"
    inkscape:export-xdpi="51.48"
    inkscape:export-ydpi="51.48">
   <metadata
@@ -28,7 +26,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -414,17 +412,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.62"
-     inkscape:cx="570.58298"
-     inkscape:cy="298.20108"
+     inkscape:zoom="2.48"
+     inkscape:cx="584.97142"
+     inkscape:cy="325.32512"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -432,7 +430,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
@@ -459,44 +458,41 @@
          id="text4338-8"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
          xml:space="preserve"><tspan
            id="tspan4344-6"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   id="tspan1469"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">- Connection via cloud/internet:</tspan></tspan><tspan
+             id="tspan1469"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">- Connection via cloud/internet:</tspan></tspan><tspan
            id="tspan1497"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line">-<tspan
    id="tspan1499"
-   style="font-size:29.14851379px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
+   style="font-size:29.1485px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
            id="tspan1514"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="399.14392"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules:</tspan><tspan
            id="tspan4651-8"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="427.06345"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340-3"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="450.39679"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342-1"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="473.7301"
            x="-0.59244788"
            sodipodi:role="line" /></text>
@@ -518,10 +514,7 @@
        y="389.75635"
        x="987.85223"
        id="image1509"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU
-CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO
-RK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO RK5CYII= "
        preserveAspectRatio="none"
        height="2"
        width="30.799999" />
@@ -534,29 +527,32 @@ RK5CYII=
      style="display:inline"
      sodipodi:insensitive="true">
     <path
-       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.23500001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.235;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 444.5424,89.232813 h 76.42476"
        id="path11527"
        inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.84495008;stroke-opacity:1"
-       id="rect5992-5"
-       width="221.36246"
-       height="63.53022"
-       x="375.70361"
-       y="353.04373"
-       rx="24.146883" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       x="485.46494"
-       y="391.01978"
-       id="text5996-5"><tspan
-         sodipodi:role="line"
-         x="485.46494"
-         y="391.01978"
-         style="font-size:24px;stroke-width:0.99999994"
-         id="tspan5998-2">uCPE Manager</tspan></text>
+    <g
+       id="g156">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.969371;stroke-opacity:1"
+         id="rect5992-5"
+         width="291.35449"
+         height="63.53022"
+         x="340.70761"
+         y="353.04373"
+         rx="31.781824" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+         x="485.43564"
+         y="390.87329"
+         id="text5996-5"><tspan
+           sodipodi:role="line"
+           x="488.76962"
+           y="390.87329"
+           style="font-size:24px;stroke-width:1"
+           id="tspan5998-2">Enea Edge Management </tspan></text>
+    </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 1.5, 0.75, 1.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M 460.37542,254.79742 V 149.42008"
@@ -586,13 +582,13 @@ RK5CYII=
        id="path11692"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.75520343;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.755203;stroke-opacity:1"
        d="m 491.81875,246.74813 a 38.600327,32.823472 0 0 0 -25.24788,8.04933 27.691538,18.320077 0 0 0 -5.80018,-0.41593 27.691538,18.320077 0 0 0 -23.74662,8.93786 38.447615,26.894051 0 0 0 -3.79253,-0.13266 38.447615,26.894051 0 0 0 -38.4479,26.89421 38.447615,26.894051 0 0 0 10.38596,18.35286 19.300164,12.976722 0 0 0 -0.62115,3.19793 19.300164,12.976722 0 0 0 19.30015,12.97675 19.300164,12.976722 0 0 0 6.7672,-0.83044 17.621889,21.373424 0 0 0 11.69382,5.41047 17.621889,21.373424 0 0 0 9.99262,-3.79733 31.887227,22.900097 0 0 0 22.73375,6.85066 31.887227,22.900097 0 0 0 24.66115,-8.40412 46.991706,19.083413 0 0 0 22.33058,2.29742 46.991706,19.083413 0 0 0 46.9917,-19.0834 46.991706,19.083413 0 0 0 -2.79443,-6.4272 36.370861,21.373424 0 0 0 11.76106,-15.70957 36.370861,21.373424 0 0 0 -36.36972,-21.37342 36.370861,21.373424 0 0 0 -14.98321,1.92624 38.600327,32.823472 0 0 0 -34.81437,-18.71962 z"
        id="path5091-2"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="485.34775"
        y="297.94391"
        id="text6011-4"><tspan
@@ -600,7 +596,7 @@ RK5CYII=
          id="tspan6009-5"
          x="485.34775"
          y="297.94391"
-         style="font-size:24px;stroke-width:0.99999994">Internet</tspan></text>
+         style="font-size:24px;stroke-width:1">Internet</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -614,11 +610,7 @@ RK5CYII=
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.45701396;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3"
@@ -661,14 +653,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="957.31738"
        y="-92.298775"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="957.31738"
          y="-92.298775"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -685,7 +677,7 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.642"
        y="-37.128029"
        id="text6066-5"><tspan
@@ -693,11 +685,10 @@ RK5CYII=
          id="tspan6064-5"
          x="1096.642"
          y="-37.128029"
-         style="font-size:18.66666603px;stroke-width:0.99999994">Iperf client</tspan><tspan
+         style="font-size:18.6667px;stroke-width:1">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="1096.642"
          y="-14.995701"
-         style="font-size:16px;stroke-width:0.99999994"
          id="tspan5627" /></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.89580917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -714,14 +705,14 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.7786"
        y="59.194824"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="1096.7786"
          y="59.194824"
-         style="font-size:18.66666603px;stroke-width:0.99999994"
+         style="font-size:18.6667px;stroke-width:1"
          id="tspan5627-2">Iperf server</tspan></text>
     <path
        style="display:inline;fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker7435-0)"
@@ -745,25 +736,25 @@ RK5CYII=
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.9641"
        y="-2.1860938"
        id="text6066-5-66"><tspan
          sodipodi:role="line"
          x="1096.9641"
          y="-2.1860938"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-5">192.168.20.20</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1097.2831"
        y="95.599319"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="1097.2831"
          y="95.599319"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        style="display:inline"
@@ -784,7 +775,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6-7"
@@ -793,7 +784,7 @@ RK5CYII=
              id="tspan890-2-5-4"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252"
@@ -801,7 +792,7 @@ RK5CYII=
          x="667.90558"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="186.91054"
            x="667.90558"
            id="tspan250"
@@ -854,14 +845,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="169.95915"
        y="5.452795"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="169.95915"
          y="5.452795"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -903,14 +894,14 @@ RK5CYII=
        rx="22.734337" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-29.048643"
        y="123.04565"
        id="text6066-5-6"><tspan
          sodipodi:role="line"
          x="-26.644997"
          y="123.04565"
-         style="font-size:17.33333397px;stroke-width:0.99999994"
+         style="font-size:17.3333px;stroke-width:1"
          id="tspan8402">Clavister </tspan></text>
     <text
        xml:space="preserve"
@@ -948,7 +939,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6"
@@ -957,7 +948,7 @@ RK5CYII=
              id="tspan890-2-5"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252-9"
@@ -965,7 +956,7 @@ RK5CYII=
          x="273.58078"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="188.12259"
            x="273.58078"
            id="tspan250-1"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
index d6a8d57..2c9ae6b 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg
index 40cbd93..a33c619 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,10 +13,10 @@
    viewBox="0 0 238.40312 130.74671"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_clavister_sriov_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_clavister_sriov.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_sriov_new.png"
+   inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp54837\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_clavister_sriov.png"
    inkscape:export-xdpi="63.925339"
    inkscape:export-ydpi="63.925339">
   <defs
@@ -531,15 +529,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81225243"
-     inkscape:cx="514.32224"
-     inkscape:cy="255.43341"
+     inkscape:zoom="1.1486984"
+     inkscape:cx="488.71255"
+     inkscape:cy="196.7697"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer10"
+     inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -551,7 +549,8 @@
      showborder="false"
      width="300mm"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0">
     <sodipodi:guide
        position="234.31314,62.223912"
        orientation="1,0"
@@ -586,7 +585,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -607,7 +606,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -618,17 +618,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g2241"
        transform="translate(-15.799047,-41.898826)">
@@ -648,7 +644,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4-5)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4-5)"
            x="-0.59244788"
            y="284.13779"
            id="text4338-8"
@@ -656,41 +652,38 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344-6">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
                id="tspan1469">- Connection via cloud/internet:</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1497">-<tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1499"> VPN/Back to Back (BTB):</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="399.14392"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1514">- Flow rules:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="427.06345"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651-8" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="450.39679"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340-3" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="473.7301"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342-1" /></text>
       </g>
       <g
@@ -734,18 +727,18 @@
          id="text1462"
          y="98.868729"
          x="111.07041"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="98.868729"
            x="111.07041"
            id="tspan1460"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1346">
+       id="g216">
       <g
-         transform="translate(87.515383,68.184073)"
+         transform="matrix(0.80350883,0,0,1,91.871977,68.184073)"
          id="g6108">
         <g
            id="g2625">
@@ -756,42 +749,32 @@
              height="24.0366"
              width="55.009563"
              id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
+             style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         </g>
         <text
            id="text15008"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006"
-             sodipodi:role="line" /><tspan
-             id="tspan15010"
-             style="stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          transform="scale(0.94922996,1.0534855)"
          id="text6054-2-0-3"
-         y="120.37572"
-         x="129.69933"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264198px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977006"
+         y="120.33696"
+         x="126.71664"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977"
          xml:space="preserve"><tspan
-           id="tspan1118-7-2-0"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="120.37572"
-           x="129.69933"
-           sodipodi:role="line">uCPE</tspan><tspan
            id="tspan6174-7"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="128.3132"
-           x="129.69933"
-           sodipodi:role="line"> Manager</tspan></text>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="120.33696"
+           x="126.71664"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="128.27446"
+           x="127.59875"
+           sodipodi:role="line"
+           id="tspan207">Management </tspan></text>
     </g>
     <path
        transform="translate(0,-77.881364)"
@@ -858,7 +841,7 @@
        rx="10.417009" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
        x="171.21869"
        y="16.540989"
        id="text1105-2"><tspan
@@ -866,7 +849,7 @@
          id="tspan1103-4"
          x="171.21869"
          y="16.540989"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device2</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device2</tspan></text>
     <g
        id="g2338"
        transform="translate(0,-1.5875)">
@@ -917,25 +900,25 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.77724"
        y="58.461411"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="206.77724"
          y="58.461411"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583"
          id="tspan5627-2">Iperf server</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="68.09343"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="68.09343"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        id="g1222"
@@ -973,7 +956,7 @@
        transform="scale(-1,1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.27662691;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.276627;enable-background:new"
        x="144.95157"
        y="71.632065"
        id="text4883-3-7-0"
@@ -983,7 +966,7 @@
          id="tspan4881-7-2-8"
          x="144.95157"
          y="71.632065"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.27662691">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.276627">SR-IOV</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
        id="rect6062-5-1"
@@ -994,7 +977,7 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.82547"
        y="33.928337"
        id="text6066-5-7"><tspan
@@ -1002,22 +985,21 @@
          id="tspan6064-5-1"
          x="206.82547"
          y="33.928337"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Iperf client</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="206.82547"
          y="39.784184"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
          id="tspan5627-1" /></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="43.173389"
        id="text6066-5-66-0"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="43.173389"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-5-9">192.168.20.20</tspan></text>
   </g>
   <g
@@ -1036,7 +1018,7 @@
        rx="10.845516" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="33.868488"
        y="15.210441"
        id="text1105"><tspan
@@ -1044,7 +1026,7 @@
          id="tspan1103"
          x="33.868488"
          y="15.210441"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device1</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device1</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.480912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 62.395761,39.457166 H 94.337973"
@@ -1057,7 +1039,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        x="85.768204"
        y="71.705055"
        id="text4883-3-7"
@@ -1067,7 +1049,7 @@
          id="tspan4881-7-2"
          x="85.768204"
          y="71.705055"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
     <g
        style="stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        id="g1209"
@@ -1138,10 +1120,10 @@
          id="text6066-5-6"
          y="123.04565"
          x="-29.048643"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
            id="tspan8402"
-           style="font-size:17.33333397px;stroke-width:0.99999994"
+           style="font-size:17.3333px;stroke-width:1"
            y="123.04565"
            x="-26.644997"
            sodipodi:role="line">Clavister </tspan></text>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
index 48ff9cc..be97bc0 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg
index 8e692f2..fc71729 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 221.39921 112.481"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="uc_enea_test_vnf.svg"
-   inkscape:export-filename="X:\images\uc_enea_test_vnf.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_enea_test_vnf.png"
    inkscape:export-xdpi="65.025185"
    inkscape:export-ydpi="65.025185"
    style="enable-background:new">
@@ -513,25 +511,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.0610016"
-     inkscape:cx="543.91141"
-     inkscape:cy="26.216313"
+     inkscape:zoom="1.2316035"
+     inkscape:cx="337.42354"
+     inkscape:cy="213.58292"
      inkscape:document-units="mm"
-     inkscape:current-layer="svg8"
+     inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:showpageshadow="false"
      showborder="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
+     fit-margin-bottom="0"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -575,9 +574,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -591,27 +590,29 @@
      style="display:inline"
      transform="translate(43.000002,-286.11663)">
     <g
-       id="g11688"
-       transform="matrix(0.26458333,0,0,0.26458333,-88.315532,289.3279)">
+       id="g158"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp57962\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_enea_test_vnf.png"
+       inkscape:export-xdpi="65"
+       inkscape:export-ydpi="65">
       <rect
-         rx="23.192089"
-         y="349.04373"
-         x="368.70782"
-         height="63.53022"
-         width="212.60954"
+         rx="7.4362011"
+         y="381.67905"
+         x="3.2798252"
+         height="16.809036"
+         width="68.170113"
          id="rect5992-5"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82807648;stroke-opacity:1" />
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.241189;stroke-opacity:1" />
       <text
          id="text5996-5"
-         y="386.32968"
-         x="474.19489"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         y="391.50983"
+         x="37.162312"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5998-2"
-           style="font-size:21.33333397px;stroke-width:0.99999994"
-           y="386.32968"
-           x="474.19489"
-           sodipodi:role="line">uCPE Manager</tspan></text>
+           style="font-size:5.64444px;stroke-width:0.264583"
+           y="391.50983"
+           x="37.162312"
+           sodipodi:role="line">Enea Edge Management</tspan></text>
     </g>
     <g
        transform="matrix(0.26458333,0,0,0.26458333,-91.32444,288.26957)"
@@ -657,9 +658,9 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
@@ -672,7 +673,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="36.357403"
        y="311.03873"
        id="text11531"><tspan
@@ -680,7 +681,7 @@
          id="tspan11529"
          x="36.357403"
          y="311.03873"
-         style="stroke-width:0.26458332">BTB</tspan></text>
+         style="stroke-width:0.264583">BTB</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -698,14 +699,14 @@
        rx="5.6691012" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="-8.9502325"
        y="289.71228"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="-8.9502325"
          y="289.71228"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <g
        id="g9810-0"
@@ -744,10 +745,10 @@
          id="text6066-5-6"
          y="320.267"
          x="-14.748354"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-4"
-           style="font-size:4.93888903px;stroke-width:0.26458332"
+           style="font-size:4.93889px;stroke-width:0.264583"
            y="320.267"
            x="-14.748354"
            sodipodi:role="line">pktgen_dpdk</tspan></text>
@@ -809,14 +810,14 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="113.53959"
        y="290.06937"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="113.53959"
          y="290.06937"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <g
        id="g2590"
@@ -833,10 +834,10 @@
          id="text6066-5-5"
          y="334.9874"
          x="150.85605"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-2"
-           style="font-size:5.64444447px;stroke-width:0.26458332"
+           style="font-size:5.64444px;stroke-width:0.264583"
            y="334.9874"
            x="150.85605"
            sodipodi:role="line">testpmd_fwd</tspan></text>
@@ -851,14 +852,14 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.75102"
        y="309.03262"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="150.75102"
          y="309.03262"
-         style="font-size:5.64444447px;stroke-width:0.26458332"
+         style="font-size:5.64444px;stroke-width:0.264583"
          id="tspan5627-2-6">testpmd_term</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.47971678;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -911,9 +912,9 @@
          id="text892-7"
          y="-87.169403"
          x="320.57385"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:4.93888855px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:4.93889px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-87.169403"
            x="320.57385"
            id="tspan890-2"
@@ -922,9 +923,9 @@
          id="text148"
          y="343.02264"
          x="84.63942"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="343.02264"
            x="84.63942"
            id="tspan146"
@@ -966,35 +967,33 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
            id="tspan4350"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="357.00906"
            x="-0.59244788"
            sodipodi:role="line">- Back to Back: BTB</tspan><tspan
            id="tspan4651"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="393.4447"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules: </tspan><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="420.43878"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="443.77213"
            x="-0.59244788"
            sodipodi:role="line" /></text>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
index fe18850..f8ae39a 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg
index 191ec5e..160c8b0 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,10 +12,10 @@
    viewBox="0 0 210.00378 81.219772"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_fortigate_fw_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_fortigate_fw.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_fw_new.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_fw.png"
    inkscape:export-xdpi="62.189999"
    inkscape:export-ydpi="62.189999">
   <defs
@@ -430,15 +428,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81640387"
-     inkscape:cx="400.67601"
-     inkscape:cy="137.53467"
+     inkscape:zoom="1.1545694"
+     inkscape:cx="415.37929"
+     inkscape:cy="192.98518"
      inkscape:document-units="mm"
      inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -451,7 +449,8 @@
      width="300mm"
      inkscape:snap-global="false"
      showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -460,7 +459,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -491,26 +490,16 @@
            id="text15008-4"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180"
          y="45.066971"
          x="6.3358655"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="45.066971"
            x="6.3358655"
            id="tspan4178"
@@ -525,11 +514,11 @@
      transform="translate(-24.600193,-22.751582)"
      sodipodi:insensitive="true">
     <flowRoot
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        id="flowRoot4207"
        xml:space="preserve"><flowRegion
          id="flowRegion4209"
-         style="stroke-width:0.26458332"><rect
+         style="stroke-width:0.264583"><rect
            y="45.600235"
            x="114.33484"
            height="6.1890655"
@@ -537,7 +526,8 @@
            id="rect4211"
            style="stroke-width:0.07000434" /></flowRegion><flowPara
          id="flowPara4213"
-         style="stroke-width:0.26458332" /></flowRoot>    <rect
+         style="stroke-width:0.264583" /></flowRoot>
+    <rect
        style="fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.31052992;stroke-opacity:1"
        id="rect5977"
        width="97.136261"
@@ -548,15 +538,10 @@
        ry="9.8702631" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.08812"
        y="89.025627"
-       id="text1502"><tspan
-         sodipodi:role="line"
-         id="tspan1500"
-         x="89.025627"
-         y="67.05687"
-         style="stroke-width:0.26458332"></tspan></text>
+       id="text1502" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.3192617;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 140.76137,41.619283 33.63394,0.0069"
@@ -568,9 +553,9 @@
          id="text265-1"
          y="49.513149"
          x="150.1429"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="49.513149"
            x="150.1429"
            id="tspan263-9"
@@ -589,7 +574,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -597,7 +582,7 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <path
@@ -612,9 +597,9 @@
          id="text265"
          y="96.958344"
          x="55.008671"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.958344"
            x="55.008671"
            id="tspan263"
@@ -633,7 +618,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="62.570286"
            y="88.203476"
            id="text892-7-06-88"><tspan
@@ -641,7 +626,7 @@
              id="tspan890-2-0-9"
              x="62.570286"
              y="88.203476"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan1_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan1_br</tspan></text>
       </g>
     </g>
     <path
@@ -656,9 +641,9 @@
          id="text265-3"
          y="96.955482"
          x="75.671005"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.955482"
            x="75.671005"
            id="tspan263-5"
@@ -676,7 +661,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
            x="85.373268"
            y="89.924515"
            id="text892-7-06-88-2"><tspan
@@ -684,7 +669,7 @@
              id="tspan890-2-0-9-9"
              x="85.373268"
              y="89.924515"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan2_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan2_br</tspan></text>
       </g>
     </g>
     <rect
@@ -697,7 +682,7 @@
        rx="3.6602547" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.82442"
        y="50.472015"
        id="text1458-5"><tspan
@@ -705,7 +690,7 @@
          x="127.82442"
          y="50.472015"
          id="tspan1460-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Fortigate</tspan></text>
     <rect
        style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        id="rect5977-9-8-71-3-5"
@@ -726,14 +711,14 @@
        transform="scale(1,-1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.12518"
        y="25.319901"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="127.12518"
          y="25.319901"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-0">uCPE Device</tspan></text>
   </g>
   <g
@@ -754,7 +739,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -765,17 +751,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g1482"
        transform="translate(-10.990187,-5.5412151)">
@@ -785,7 +767,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -793,29 +775,26 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="322.9603"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
    id="tspan1469">- Connection via cloud/internet:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="350.87982"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="374.21317"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="397.54651"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -851,10 +830,11 @@
            height="43.090054"
            x="27.085176"
            y="256.68076" /></flowRegion><flowPara
-         id="flowPara4176">Test</flowPara></flowRoot>    <flowRoot
+         id="flowPara4176">Test</flowPara></flowRoot>
+    <flowRoot
        xml:space="preserve"
        id="flowRoot4685"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        transform="scale(0.26458333)"><flowRegion
          id="flowRegion4687"><rect
            id="rect4689"
@@ -862,27 +842,19 @@
            height="36.934334"
            x="790.39471"
            y="328.7027" /></flowRegion><flowPara
-         id="flowPara4691" /></flowRoot>    <path
-       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.36356106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.72712207, 0.36356105, 0.18178051, 0.36356105;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="flowPara4691" /></flowRoot>
+    <path
+       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.363561;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.727122, 0.363561, 0.181781, 0.363561;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        d="M 210.06435,61.711725 V 79.966961"
        id="path8471-8"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="4.2375026"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.21806791;stroke-opacity:1"
-       id="rect5992-9-0"
-       width="39.340992"
-       height="23.810053"
-       x="190.41014"
-       y="80.052269"
-       rx="4.2914338" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.32243,57.524306 h -19.398"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="2.9787803"
        height="6.1577935"
@@ -891,12 +863,12 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.26268,41.636225 h -19.398"
        id="path8471-3-0-3-8-9"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3-9"
        width="2.9787803"
        height="6.1577935"
@@ -905,13 +877,13 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.25427502;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.254275;stroke-opacity:1"
        d="m 211.52785,26.000497 a 10.280439,13.97151 0 0 0 -6.72428,3.426249 7.3750976,7.798052 0 0 0 -1.54476,-0.177046 7.3750976,7.798052 0 0 0 -6.32445,3.804457 10.239768,11.447616 0 0 0 -1.01007,-0.05647 10.239768,11.447616 0 0 0 -10.23984,11.447682 10.239768,11.447616 0 0 0 2.7661,7.812005 5.1402199,5.5236202 0 0 0 -0.16543,1.361221 5.1402199,5.5236202 0 0 0 5.14021,5.523629 5.1402199,5.5236202 0 0 0 1.80232,-0.35348 4.6932442,9.0977274 0 0 0 3.11442,2.302999 4.6932442,9.0977274 0 0 0 2.66133,-1.616355 8.4925367,9.7475653 0 0 0 6.05469,2.916023 8.4925367,9.7475653 0 0 0 6.56801,-3.577265 12.515318,8.1229707 0 0 0 5.94732,0.977913 12.515318,8.1229707 0 0 0 12.51531,-8.122967 12.515318,8.1229707 0 0 0 -0.74424,-2.735776 9.6866648,9.0977274 0 0 0 3.13233,-6.686873 9.6866648,9.0977274 0 0 0 -9.68636,-9.097724 9.6866648,9.0977274 0 0 0 -3.99049,0.819912 10.280439,13.97151 0 0 0 -9.27212,-7.96812 z"
        id="path5091-2-9"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="199.03485"
        y="46.431309"
        id="text4180-9-8-7"><tspan
@@ -919,20 +891,50 @@
          id="tspan4178-6-6-2"
          x="199.03485"
          y="46.431309"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Internet</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Internet</tspan></text>
     <flowRoot
        xml:space="preserve"
        id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.23662585,0,0,0.23365212,70.806276,-5.7897538)"><flowRegion
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       transform="matrix(0.4543271,0,0,0.23365212,-57.332226,-5.7897538)"><flowRegion
          id="flowRegion2132"><rect
            id="rect2134"
            width="118.79844"
            height="68.571358"
            x="528.01184"
            y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.0058px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+         id="flowPara2138" /></flowRoot>
+    <g
+       id="g188"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp01954\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_fw.png"
+       inkscape:export-xdpi="62"
+       inkscape:export-ydpi="62">
+      <rect
+         ry="4.2313652"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.252553;stroke-opacity:1"
+         id="rect5992-9-0"
+         width="52.844162"
+         height="23.775566"
+         x="183.65855"
+         y="80.069511"
+         rx="5.7644005" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="209.83569"
+         y="89.745026"
+         id="text160"><tspan
+           sodipodi:role="line"
+           id="tspan158"
+           x="209.83569"
+           y="89.745026"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="209.83569"
+           y="97.682526"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan162">Management</tspan></text>
+    </g>
+  </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
index cd82461..b71b02e 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
index 4255bf6..3de54dd 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -16,8 +14,8 @@
    height="482.41965"
    viewBox="0 0 830.09292 482.41966"
    sodipodi:docname="uc_fortigate_sdwan.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_sdwan.png"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_sdwan.png"
    inkscape:export-xdpi="65.519997"
    inkscape:export-ydpi="65.519997">
   <metadata
@@ -430,17 +428,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="1.0074671"
-     inkscape:cx="429.30796"
-     inkscape:cy="215.58101"
+     inkscape:cx="419.71809"
+     inkscape:cy="299.93679"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -448,7 +446,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer1"
@@ -485,7 +484,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -493,7 +492,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -507,7 +506,7 @@
        ry="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -515,11 +514,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -538,15 +537,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -568,9 +567,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -593,9 +592,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -618,9 +617,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -644,9 +643,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -718,53 +717,45 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3060993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6121985, 1.30609926, 0.65304962, 1.30609926;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6122, 1.3061, 0.65305, 1.3061;stroke-dashoffset:0;stroke-opacity:1"
        d="m 492.68784,161.04591 v 79.89453"
        id="path8471-3-0-5-4-7-6-3"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29300523;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601049, 1.29300525, 0.64650262, 1.29300525;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29301;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601, 1.29301, 0.646503, 1.29301;stroke-dashoffset:0;stroke-opacity:1"
        d="M 440.34086,288.13958 V 209.83895"
        id="path8471-3-0"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="16.015759"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
-       id="rect5992-9"
-       width="148.69037"
-       height="89.990753"
-       x="365.99567"
-       y="288.93851"
-       rx="16.219593" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 569.66925,124.00658 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="m 389.31534,159.12973 v 79.93098"
        id="path8471-3-0-5-4-7-6-3-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 389.33652,181.0334 H 309.40554"
        id="path8471-3-0-5-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 568.52125,182.74033 H 488.59028"
        id="path8471-3-0-5-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 853.95759,519.79962 -30.03505,0.0338"
        id="path8471-3-2-5-5-4-6-9-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 355.88704,123.01486 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8-8"
        inkscape:connector-curvature="0" />
@@ -774,64 +765,73 @@
          inkscape:connector-curvature="0"
          id="path5091-2"
          d="m 445.81065,75.822009 a 38.855204,52.805708 0 0 0 -25.4146,12.949601 27.874385,29.472953 0 0 0 -5.83847,-0.669151 27.874385,29.472953 0 0 0 -23.90343,14.379051 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="153.04083"
          x="398.5928"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="153.04083"
            x="398.5928"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.89433392,0,0,0.88309463,-86.050427,-35.503783)"><flowRegion
-         id="flowRegion2132"><rect
-           id="rect2134"
-           width="118.79844"
-           height="68.571358"
-           x="528.01184"
-           y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+    <g
+       id="g247">
+      <rect
+         ry="16.015759"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.886108;stroke-opacity:1"
+         id="rect5992-9"
+         width="171.86906"
+         height="89.990753"
+         x="354.40631"
+         y="288.93851"
+         rx="18.747995" />
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot2130"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.3924524,0,0,1.3749531,-378.43971,-225.73956)"><flowRegion
+           id="flowRegion2132"><rect
+             id="rect2134"
+             width="118.79844"
+             height="68.571358"
+             x="528.01184"
+             y="384.12811"
+             style="stroke-width:1;" /></flowRegion><flowPara
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+           id="flowPara2138">Enea Edge Management</flowPara></flowRoot>
+    </g>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="uCPE Device 2"
      transform="translate(-206.89353,53.60331)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="895.67767"
        y="-42.627693"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="895.67767"
          y="-42.627693"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <rect
        transform="scale(-1,1)"
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.34585321;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.34585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4-3"
        width="281.12839"
        height="239.35895"
@@ -840,12 +840,12 @@
        rx="30.934816"
        ry="30.030743" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23700833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 947.78223,253.10428 -0.023,-146.22781"
        id="path8471-3-2-5-5-29-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.95565,83.624017 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3"
        inkscape:connector-curvature="0" />
@@ -878,7 +878,7 @@
          ry="1.8328245" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 751.77066,141.52555 H 675.71628"
        id="path8471-3-0-5-7"
        inkscape:connector-curvature="0" />
@@ -917,7 +917,7 @@
          id="g1507">
         <rect
            ry="9.5910397"
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.45560217;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.455602;stroke-opacity:1"
            id="rect6098-9-0-0"
            width="99.182129"
            height="40.239689"
@@ -927,7 +927,7 @@
            transform="scale(-1,1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="825.0979"
            y="85.985962"
            id="text892-7-06-8"><tspan
@@ -935,7 +935,7 @@
              id="tspan890-2-0-4"
              x="825.0979"
              y="85.985962"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-7"
@@ -943,7 +943,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="111.9693"
            x="811.77759"
            id="tspan263-29"
@@ -959,22 +959,22 @@
          height="110.76262"
          width="124.50654"
          id="rect6062-3-1-3"
-         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
          ry="13.834034" />
       <text
          id="text4180-9-8"
          y="56.970852"
          x="900.65613"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="56.970852"
            x="900.65613"
            id="tspan4178-6-6"
            sodipodi:role="line">Fortigate</tspan></text>
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.77714,25.395776 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3-0"
        inkscape:connector-curvature="0" />
@@ -988,15 +988,15 @@
          height="40.235157"
          width="69.460823"
          id="rect6098-9-0-8-7"
-         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
          ry="9.5899591" />
       <text
          id="text892-7-06-6"
          y="29.063463"
          x="824.68774"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="29.063463"
            x="824.68774"
            id="tspan890-2-0-48"
@@ -1007,7 +1007,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="56.039993"
            x="811.77759"
            id="tspan263-0"
@@ -1021,7 +1021,7 @@
          x="912.22858"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="182.38129"
            x="912.22858"
            id="tspan263"
@@ -1031,7 +1031,7 @@
          style="display:inline"
          transform="translate(834.25256,-97.63017)">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2-8"
            width="69.460823"
            height="40.985825"
@@ -1041,7 +1041,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06-88"><tspan
@@ -1049,7 +1049,7 @@
              id="tspan890-2-0-9"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
   </g>
@@ -1058,27 +1058,18 @@
      id="layer7"
      inkscape:label="Test Machines"
      style="display:inline"
-     transform="translate(-314.7295,-31.73299)">
+     transform="translate(-314.7295,-31.73299)"
+     sodipodi:insensitive="true">
     <g
        style="fill:#ac9d93"
        id="g6108-0"
        transform="matrix(3.0761692,0,0,3.7814034,-32.512633,-85.890206)">
       <text
          xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
          x="53.59409"
          y="60.119961"
-         id="text15008-4"><tspan
-           sodipodi:role="line"
-           id="tspan15006-8"
-           x="53.59409"
-           y="69.483727"
-           style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-           sodipodi:role="line"
-           x="53.59409"
-           y="82.712898"
-           style="fill:#ac9d93;stroke-width:0.26458332"
-           id="tspan15010-2" /></text>
+         id="text15008-4" />
     </g>
     <g
        id="g1510"
@@ -1088,7 +1079,7 @@
          id="g6108-0-4"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8"
            width="55.009563"
            height="24.0366"
@@ -1100,26 +1091,16 @@
            id="text15008-4-9"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6"
@@ -1134,7 +1115,7 @@
          id="g6108-0-4-0"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8-1"
            width="55.009563"
            height="24.0366"
@@ -1146,26 +1127,16 @@
            id="text15008-4-9-6"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0-6"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6-1"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9-1"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6-8"
@@ -1177,9 +1148,10 @@
      id="layer4"
      inkscape:label="uCPE Device 1"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.37003899;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.37004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4"
        width="281.05768"
        height="238.16554"
@@ -1188,7 +1160,7 @@
        rx="32.21727"
        ry="29.881014" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 298.04539,180.93127 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4-8"
        inkscape:connector-curvature="0" />
@@ -1222,23 +1194,23 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="165.88004"
        y="55.204853"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="165.88004"
          y="55.204853"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 296.7775,123.21848 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4"
        inkscape:connector-curvature="0" />
     <rect
        ry="13.834034"
-       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
        id="rect6062-3-1"
        width="124.50654"
        height="110.76262"
@@ -1246,7 +1218,7 @@
        y="94.626221"
        rx="13.834034" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23712945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23713;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 113.52967,352.093 -0.023,-147.02781"
        id="path8471-3-2-5-5-29-0-3"
        inkscape:connector-curvature="0" />
@@ -1270,7 +1242,7 @@
          transform="translate(-3.3059349,7.7197473)"
          id="g1576">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
            id="rect6098-9-0-8"
            width="69.460823"
            height="40.235157"
@@ -1280,7 +1252,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="240.43568"
            y="119.65066"
            id="text892-7-8-1"><tspan
@@ -1288,7 +1260,7 @@
              id="tspan890-2-1-5"
              x="240.43568"
              y="119.65066"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
       <text
          id="text265-0"
@@ -1296,7 +1268,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="153.33401"
            x="223.73131"
            id="tspan263-2"
@@ -1307,7 +1279,7 @@
       <g
          id="g1625">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2"
            width="69.460823"
            height="40.985825"
@@ -1317,7 +1289,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06"><tspan
@@ -1325,7 +1297,7 @@
              id="tspan890-2-0"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
       <text
          id="text265-8"
@@ -1333,7 +1305,7 @@
          x="122.01346"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="281.41678"
            x="122.01346"
            id="tspan263-1"
@@ -1344,17 +1316,13 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="227.95877"
        y="622.30133"
-       id="text1355"><tspan
-         sodipodi:role="line"
-         id="tspan1353"
-         x="227.95877"
-         y="657.69196" /></text>
+       id="text1355" />
     <g
        id="g1756">
       <g
          id="g1611">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.46265486;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.462655;stroke-opacity:1"
            id="rect6098-9-0"
            width="100.74141"
            height="40.235157"
@@ -1364,7 +1332,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="237.05164"
            y="185.0871"
            id="text892-7-8"><tspan
@@ -1372,7 +1340,7 @@
              id="tspan890-2-1"
              x="237.05164"
              y="185.0871"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-3"
@@ -1380,7 +1348,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="210.3636"
            x="223.73131"
            id="tspan263-06"
@@ -1388,7 +1356,7 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="65.647079"
        y="156.07199"
        id="text4180-9-8-8"><tspan
@@ -1396,9 +1364,9 @@
          id="tspan4178-6-6-9"
          x="65.647079"
          y="156.07199"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">Fortigate</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 388.96711,239.06071 H 312.91273"
        id="path8471-3-0-5-7-8"
        inkscape:connector-curvature="0" />
@@ -1422,7 +1390,8 @@
      id="layer13"
      inkscape:label="Legend"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        id="g1353"
        transform="translate(22,-2)">
@@ -1431,38 +1400,35 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1379">- VPN/BTB:</tspan> </tspan><tspan
            id="tspan4651"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="387.31546"
+           y="387.31552"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="410.6488"
+           y="410.6489"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="433.98215"
+           y="433.98227"
            x="-0.59244788"
            sodipodi:role="line" /></text>
     </g>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
index d2527e5..6aaf4c0 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg
index 67e0250..2bb15af 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,9 +12,9 @@
    width="960.42157"
    height="482.07703"
    viewBox="0 0 960.42155 482.07702"
-   sodipodi:docname="uc_vnf_chaining_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_vnf_chaining_new.png"
+   sodipodi:docname="uc_vnf_chaining.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_vnf_chaining.png"
    inkscape:export-xdpi="60.310001"
    inkscape:export-ydpi="60.310001">
   <metadata
@@ -174,13 +172,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.81454783"
-     inkscape:cx="494.65223"
-     inkscape:cy="201.83139"
+     inkscape:zoom="1.1519446"
+     inkscape:cx="460.98794"
+     inkscape:cy="291.07773"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -192,7 +190,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer2"
@@ -213,7 +212,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -221,7 +220,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -234,7 +233,7 @@
        rx="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -242,11 +241,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -264,15 +263,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -293,9 +292,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -317,9 +316,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -341,9 +340,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -366,9 +365,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -452,11 +451,7 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 875.06947,109.79183 -0.0401,88.56814"
@@ -490,7 +485,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="765.37158"
        y="157.87267"
        id="text892-7-8-1-0"><tspan
@@ -498,7 +493,7 @@
          id="tspan890-2-1-5-6"
          x="765.37158"
          y="157.87267"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7"
@@ -537,7 +532,7 @@
            rx="13.834034" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
            x="841.7915"
            y="62.518135"
            id="text1458-5"><tspan
@@ -553,7 +548,7 @@
          x="870.17896"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="870.17896"
            id="tspan7681"
@@ -564,7 +559,7 @@
          x="795.86865"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="795.86865"
            id="tspan7685-0"
@@ -583,7 +578,7 @@
          id="text1454"
          y="405.72467"
          x="688.84973"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="405.72467"
@@ -601,7 +596,7 @@
          id="tspan263"
          x="839.50726"
          y="184.34474"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
     <rect
        style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
        id="rect6098-9-2-8"
@@ -613,7 +608,7 @@
        ry="9.7688789" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="874.43616"
        y="157.74759"
        id="text892-7-06-88"><tspan
@@ -621,7 +616,7 @@
          id="tspan890-2-0-9"
          x="874.43616"
          y="157.74759"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
        id="rect6062-3-1-8-6-6"
@@ -632,7 +627,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="683.34515"
        y="63.026798"
        id="text1466-1"><tspan
@@ -651,7 +646,7 @@
          id="tspan7681-8"
          x="709.22375"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -662,7 +657,7 @@
          id="tspan7685-0-5"
          x="639.34747"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <g
        id="g2145">
       <text
@@ -671,7 +666,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9"
@@ -690,7 +685,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -698,19 +693,19 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="763.6579"
        y="-35.451283"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="763.6579"
          y="-35.451283"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
   </g>
   <g
@@ -727,7 +722,7 @@
        inkscape:connector-curvature="0" />
     <flowRoot
        transform="translate(-199.73182,56.969024)"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        id="flowRoot1440"
        xml:space="preserve"><flowRegion
          id="flowRegion1442"><rect
@@ -736,7 +731,8 @@
            height="137.12756"
            width="147.02336"
            id="rect1444" /></flowRegion><flowPara
-         id="flowPara1446" /></flowRoot>    <path
+         id="flowPara1446" /></flowRoot>
+    <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m -134.46807,208.19818 -0.0401,88.56814"
        id="path8471-3-2-5-5-29-4-8-2-9-4-1"
@@ -774,7 +770,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.426455"
        y="256.40601"
        id="text892-7-8-1-0-9"><tspan
@@ -782,7 +778,7 @@
          id="tspan890-2-1-5-6-2"
          x="-24.426455"
          y="256.40601"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7-1"
@@ -811,7 +807,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="55.993469"
        y="161.05148"
        id="text1458-5-7"><tspan
@@ -830,7 +826,7 @@
          id="tspan7681-70"
          x="72.38092"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -841,7 +837,7 @@
          id="tspan7685-0-1"
          x="18.070602"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        id="g2807"
        transform="translate(-4)">
@@ -851,7 +847,7 @@
          x="53.709198"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="282.87811"
            x="53.709198"
            id="tspan263-0"
@@ -869,9 +865,9 @@
          id="text892-7-06-88-7"
          y="256.28094"
          x="88.638092"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="256.28094"
            x="88.638092"
            id="tspan890-2-0-9-5"
@@ -887,7 +883,7 @@
        rx="14.465943" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="-106.60316"
        y="161.1617"
        id="text1466-1-9"><tspan
@@ -908,7 +904,7 @@
          id="tspan7681-8-6"
          x="-82.574295"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -919,7 +915,7 @@
          id="tspan7685-0-5-5"
          x="-142.45058"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        transform="translate(-789.79805,98.53334)"
        style="display:inline"
@@ -930,7 +926,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9-3"
@@ -949,7 +945,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9-2"><tspan
@@ -957,19 +953,19 @@
              id="tspan890-2-1-9-7"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.288576"
        y="63.082054"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="-24.288574"
          y="63.082054"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-0">uCPE Device 1</tspan></text>
     <g
        transform="translate(-7.9999969)"
@@ -984,7 +980,7 @@
          id="text1450"
          y="404.73138"
          x="-133.32915"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="404.73138"
@@ -1014,7 +1010,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -1022,34 +1018,31 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
    id="tspan1379"
-   style="font-size:29.14851379px">- VPN/BTB:</tspan> </tspan><tspan
+   style="font-size:29.1485px">- VPN/BTB:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="387.31546"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="410.6488"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="433.98215"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -1072,29 +1065,26 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(200.89436,-53.375023)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        x="20.80323"
        y="698.74994"
-       id="text756"><tspan
-         sodipodi:role="line"
-         id="tspan754"
-         x="20.80323"
-         y="717.966" /></text>
+       id="text756" />
     <g
        id="g1813">
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6"
          d="m 472.95984,308.61809 -0.0696,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4"
          d="m 90.357212,308.60091 -0.06963,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6-9"
@@ -1102,22 +1092,22 @@
          style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:0.917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 280.32599,373.33137 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 324.94411,252.1566 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1"
        d="M 324.94411,252.15659 H 396.7464"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="11.258382"
        height="23.27355"
@@ -1131,12 +1121,12 @@
          inkscape:connector-curvature="0"
          id="path8471-3-0-5-4-7-6-3-7-20"
          d="m 230.73334,252.1566 v 71.44886"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-0-3-8-4"
          d="M 230.73334,252.15659 H 158.93105"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          rx="1.2365078"
@@ -1145,7 +1135,7 @@
          height="23.27355"
          width="11.258382"
          id="rect5977-9-8-71-3-0"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
        id="g2541">
@@ -1153,33 +1143,33 @@
          inkscape:connector-curvature="0"
          id="path5091-2-9"
          d="m 285.79578,282.35384 a 38.855204,52.805708 0 0 0 -25.4146,12.9496 27.874385,29.472953 0 0 0 -5.83847,-0.66915 27.874385,29.472953 0 0 0 -23.90343,14.37905 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="359.57266"
          x="238.57793"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.57266"
            x="238.57793"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1119">
+       id="g219">
       <rect
-         rx="16.219593"
+         rx="19.900242"
          y="445.04919"
-         x="205.9808"
+         x="189.10994"
          height="89.990753"
-         width="148.69037"
+         width="182.4321"
          id="rect5992-9-0"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.912932;stroke-opacity:1"
          ry="16.015759" />
       <flowRoot
-         transform="matrix(0.89433392,0,0,0.88309463,-246.06529,120.6069)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.4158503,0,0,1.398057,-552.21284,-79.033294)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="flowRoot2130"
          xml:space="preserve"><flowRegion
            id="flowRegion2132"><rect
@@ -1187,10 +1177,10 @@
              x="528.01184"
              height="68.571358"
              width="118.79844"
-             id="rect2134" /></flowRegion><flowPara
-           id="flowPara2136"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">uCPE</flowPara><flowPara
+             id="rect2134"
+             style="stroke-width:1;" /></flowRegion><flowPara
            id="flowPara2138"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Manager</flowPara></flowRoot>    </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Enea Edge Management</flowPara></flowRoot>
+    </g>
   </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png b/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png
index 23cc973..d119ecb 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
index 1a5ddab..57ed581 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png