more updates to the interctive architecture diagram

Issue-ID: DOC-826

Change-Id: Id1e8deca6040a863a4a23ac05430d7273ea369ca
Signed-off-by: thmsdt <thomas.kulik@telekom.de>
diff --git a/docs/ecosystem/architecture/media/onap-architecture-overview-interactive-path.svg b/docs/ecosystem/architecture/media/onap-architecture-overview-interactive-path.svg
index b0b7fe3..e08233f 100644
--- a/docs/ecosystem/architecture/media/onap-architecture-overview-interactive-path.svg
+++ b/docs/ecosystem/architecture/media/onap-architecture-overview-interactive-path.svg
@@ -31,14 +31,14 @@
      inkscape:document-units="mm"
      showgrid="true"
      inkscape:zoom="1.4142136"
-     inkscape:cx="888.12609"
-     inkscape:cy="533.86561"
+     inkscape:cx="665.38746"
+     inkscape:cy="321.02647"
      inkscape:window-width="3768"
      inkscape:window-height="2096"
      inkscape:window-x="72"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g15324"
+     inkscape:current-layer="g6143"
      height="190mm"
      showborder="true"
      inkscape:showpageshadow="true"
@@ -102,12 +102,12 @@
       <g
          id="g4786"
          inkscape:label="unmaintained"
-         transform="translate(139.99106,0.06481615)">
+         transform="translate(136.9979,0.04521811)">
         <path
            id="rect47709-1-8-8-2"
            style="display:inline;fill:#bebebe;stroke:#bebebe;stroke-width:1.98629;stop-color:#000000"
            inkscape:label="unmaintained.form"
-           d="m 135,235 h 50.014 v 4.01372 H 135 Z" />
+           d="m 135,235 h 53.01371 v 4.01372 H 135 Z" />
         <path
            d="m 135.27595,235.49454 h 0.31471 v 1.40612 q 0,0.37207 0.13488,0.5364 0.13487,0.16278 0.43718,0.16278 0.30076,0 0.43563,-0.16278 0.13488,-0.16433 0.13488,-0.5364 v -1.40612 h 0.31471 v 1.44488 q 0,0.45268 -0.2248,0.68368 -0.22324,0.23099 -0.66042,0.23099 -0.43873,0 -0.66353,-0.23099 -0.22324,-0.231 -0.22324,-0.68368 z m 3.69786,1.26659 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15347,0.18448 0.15347,0.54415 z m 1.82821,-0.35501 q 0.10697,-0.19224 0.2558,-0.28371 0.14883,-0.0915 0.35037,-0.0915 0.2713,0 0.41858,0.19069 0.14727,0.18914 0.14727,0.5395 v 1.048 h -0.2868 v -1.0387 q 0,-0.24959 -0.0884,-0.37052 -0.0884,-0.12092 -0.26975,-0.12092 -0.22169,0 -0.35036,0.14728 -0.12868,0.14728 -0.12868,0.40153 v 0.98133 h -0.2868 v -1.0387 q 0,-0.25114 -0.0884,-0.37052 -0.0884,-0.12092 -0.27285,-0.12092 -0.21859,0 -0.34727,0.14883 -0.12867,0.14728 -0.12867,0.39998 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.0977,-0.15968 0.23409,-0.23564 0.13643,-0.076 0.32402,-0.076 0.18913,0 0.32091,0.0961 0.13332,0.0961 0.19688,0.27906 z m 2.43748,0.5302 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56895,-0.11783 v 0.99064 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.2434,0.2341 -0.14572,0.0744 -0.35656,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14883 0.58601,-0.14883 h 0.39998 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19534 0.18603,0.19534 0.18603,0.59221 z m 0.49496,-0.74569 h 0.28526 v 1.73633 h -0.28526 z m 0,-0.67593 h 0.28526 v 0.36122 h -0.28526 z m 2.23284,1.36426 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 0.7585,-1.18132 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.2372,0.0605 h 0.293 v 0.23874 h -0.293 q -0.33021,0 -0.45579,-0.12247 -0.12557,-0.12403 -0.12557,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 1.65923,1.35651 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37983,-0.16743 0.14417,-0.16898 0.14417,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28526 v -0.26355 q -0.0977,0.15813 -0.24339,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19534,-0.44184 0.19688,-0.14883 0.58601,-0.14883 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.2899,0.0357 -0.14108,0.0357 -0.27131,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.28681,-0.031 0.37672,0 0.56275,0.19534 0.18604,0.19534 0.18604,0.59221 z m 0.49495,-0.74569 h 0.28526 v 1.73633 h -0.28526 z m 0,-0.67593 h 0.28526 v 0.36122 h -0.28526 z m 2.23284,1.36426 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.96153,0.10852 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.231,-0.25115 0.62167,-0.25115 0.35037,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 1.8034,-0.44959 v -0.93948 h 0.28526 v 2.41226 h -0.28526 v -0.26045 q -0.0899,0.15503 -0.22789,0.231 -0.13643,0.0744 -0.32866,0.0744 -0.31471,0 -0.51315,-0.25115 -0.19689,-0.25115 -0.19689,-0.66042 0,-0.40928 0.19689,-0.66043 0.19844,-0.25115 0.51315,-0.25115 0.19223,0 0.32866,0.076 0.13798,0.0744 0.22789,0.22944 z m -0.97203,0.60617 q 0,0.31471 0.12867,0.49454 0.13023,0.17828 0.35657,0.17828 0.22634,0 0.35657,-0.17828 0.13022,-0.17983 0.13022,-0.49454 0,-0.31471 -0.13022,-0.493 -0.13023,-0.17983 -0.35657,-0.17983 -0.22634,0 -0.35657,0.17983 -0.12867,0.17829 -0.12867,0.493 z m 3.35618,-1.23559 q -0.34107,0 -0.5426,0.25425 -0.19999,0.25425 -0.19999,0.69298 0,0.43719 0.19999,0.69143 0.20153,0.25425 0.5426,0.25425 0.34106,0 0.5395,-0.25425 0.19999,-0.25424 0.19999,-0.69143 0,-0.43873 -0.19999,-0.69298 -0.19844,-0.25425 -0.5395,-0.25425 z m 0,-0.25424 q 0.48679,0 0.77825,0.32711 0.29145,0.32556 0.29145,0.87436 0,0.54726 -0.29145,0.87437 -0.29146,0.32556 -0.77825,0.32556 -0.48834,0 -0.78135,-0.32556 -0.29145,-0.32556 -0.29145,-0.87437 0,-0.5488 0.29145,-0.87436 0.29301,-0.32711 0.78135,-0.32711 z m 1.46699,0.0419 h 0.42168 l 1.02629,1.93632 v -1.93632 h 0.30386 v 2.31459 h -0.42168 l -1.02629,-1.93632 v 1.93632 h -0.30386 z m 3.05604,0.30851 -0.42478,1.15187 h 0.85111 z m -0.17673,-0.30851 h 0.35501 l 0.88212,2.31459 h -0.32556 l -0.21084,-0.59376 h -1.04335 l -0.21084,0.59376 h -0.33021 z m 1.79565,0.25735 v 0.86972 h 0.39377 q 0.21859,0 0.33797,-0.11317 0.11937,-0.11318 0.11937,-0.32247 0,-0.20774 -0.11937,-0.32091 -0.11938,-0.11317 -0.33797,-0.11317 z m -0.31316,-0.25735 h 0.70693 q 0.38913,0 0.58756,0.17674 0.19999,0.17518 0.19999,0.51469 0,0.34262 -0.19999,0.5178 -0.19843,0.17519 -0.58756,0.17519 h -0.39377 v 0.93017 h -0.31316 z m 4.20729,0.17829 v 0.33021 q -0.15813,-0.14728 -0.33797,-0.22014 -0.17828,-0.0729 -0.37982,-0.0729 -0.39687,0 -0.60771,0.2434 -0.21084,0.24185 -0.21084,0.70073 0,0.45734 0.21084,0.70073 0.21084,0.24185 0.60771,0.24185 0.20154,0 0.37982,-0.0729 0.17984,-0.0729 0.33797,-0.22014 v 0.32711 q -0.16433,0.11162 -0.34882,0.16743 -0.18293,0.0558 -0.38757,0.0558 -0.52555,0 -0.82786,-0.32091 -0.30231,-0.32246 -0.30231,-0.87902 0,-0.5581 0.30231,-0.87901 0.30231,-0.32246 0.82786,-0.32246 0.20774,0 0.39067,0.0558 0.18449,0.0543 0.34572,0.16433 z m 1.05151,0.59996 q -0.22944,0 -0.36277,0.17983 -0.13332,0.17829 -0.13332,0.4899 0,0.31161 0.13177,0.49144 0.13333,0.17828 0.36432,0.17828 0.22789,0 0.36122,-0.17983 0.13332,-0.17983 0.13332,-0.48989 0,-0.30851 -0.13332,-0.48835 -0.13333,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.52894,0.37518 q 0.10697,-0.19224 0.2558,-0.28371 0.14883,-0.0915 0.35037,-0.0915 0.2713,0 0.41857,0.19069 0.14728,0.18914 0.14728,0.5395 v 1.048 h -0.2868 v -1.0387 q 0,-0.24959 -0.0884,-0.37052 -0.0884,-0.12092 -0.26975,-0.12092 -0.22169,0 -0.35037,0.14728 -0.12867,0.14728 -0.12867,0.40153 v 0.98133 h -0.2868 v -1.0387 q 0,-0.25114 -0.0884,-0.37052 -0.0884,-0.12092 -0.27285,-0.12092 -0.21859,0 -0.34727,0.14883 -0.12867,0.14728 -0.12867,0.39998 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.0977,-0.15968 0.23409,-0.23564 0.13643,-0.076 0.32401,-0.076 0.18914,0 0.32091,0.0961 0.13333,0.0961 0.19689,0.27906 z m 1.92433,1.14256 v 0.92088 h -0.28681 v -2.39676 h 0.28681 v 0.26355 q 0.0899,-0.15503 0.22634,-0.22944 0.13797,-0.076 0.32866,-0.076 0.31626,0 0.51315,0.25115 0.19844,0.25115 0.19844,0.66043 0,0.40927 -0.19844,0.66042 -0.19689,0.25115 -0.51315,0.25115 -0.19069,0 -0.32866,-0.0744 -0.13643,-0.076 -0.22634,-0.231 z m 0.97048,-0.60616 q 0,-0.31471 -0.13023,-0.493 -0.12867,-0.17983 -0.35501,-0.17983 -0.22634,0 -0.35657,0.17983 -0.12867,0.17829 -0.12867,0.493 0,0.31471 0.12867,0.49454 0.13023,0.17828 0.35657,0.17828 0.22634,0 0.35501,-0.17828 0.13023,-0.17983 0.13023,-0.49454 z m 1.34917,-0.66973 q -0.22944,0 -0.36277,0.17983 -0.13332,0.17829 -0.13332,0.4899 0,0.31161 0.13177,0.49144 0.13333,0.17828 0.36432,0.17828 0.22789,0 0.36122,-0.17983 0.13332,-0.17983 0.13332,-0.48989 0,-0.30851 -0.13332,-0.48835 -0.13333,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.62041,0.73019 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.96153,0.10852 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.231,-0.25115 0.62167,-0.25115 0.35037,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 2.10416,-0.0248 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 0.75851,-1.18132 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12403 -0.12558,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z"
            id="text1436-447-9-3"
@@ -118,13 +118,13 @@
       <g
          id="g4786-5"
          inkscape:label="onapcomponents"
-         transform="translate(87.991058,0.05109846)"
+         transform="translate(83.997896,0.04521811)"
          style="display:inline">
         <path
            id="rect47709-1-8-8-2-35"
            style="display:inline;fill:#007da5;stroke:#007da5;stroke-width:1.98629;stop-color:#000000"
            inkscape:label="onapcomponents.form"
-           d="m 135,235 h 50.01371 v 4.01372 H 135 Z" />
+           d="m 135,235 h 51.01371 v 4.01372 H 135 Z" />
         <path
            d="m 135.31161,235.49454 h 1.46348 v 0.26355 h -1.15032 v 0.68523 h 1.10226 v 0.26355 h -1.10226 v 0.83871 h 1.17822 v 0.26355 h -1.49138 z m 3.34439,1.26659 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15347,0.18448 0.15347,0.54415 z m 0.75851,-1.18132 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.2372,0.0605 h 0.293 v 0.23874 h -0.293 q -0.33022,0 -0.45579,-0.12247 -0.12557,-0.12403 -0.12557,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 0.87013,0.49299 h 0.28525 v 1.73633 h -0.28525 z m 0,-0.67593 h 0.28525 v 0.36122 h -0.28525 z m 1.79565,0.94258 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.014 -0.12402,-0.014 -0.24185,0 -0.37207,0.15813 -0.12868,0.15658 -0.12868,0.45114 v 0.91467 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.0899,-0.15813 0.2341,-0.23409 0.14417,-0.0775 0.35036,-0.0775 0.0295,0 0.0651,0.005 0.0356,0.003 0.0791,0.0109 z m 1.62202,0.5302 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16434,0.37982 z m 0.94299,-1.20613 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12403 -0.12558,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 1.59256,2.39055 q -0.12092,0.31006 -0.23564,0.40463 -0.11472,0.0946 -0.30696,0.0946 h -0.22789 v -0.23875 h 0.16743 q 0.11782,0 0.18293,-0.0558 0.0651,-0.0558 0.14418,-0.26355 l 0.0512,-0.13022 -0.70228,-1.70843 h 0.3023 l 0.54261,1.35806 0.5426,-1.35806 h 0.30231 z m 2.3888,-1.69757 q -0.22945,0 -0.36277,0.17983 -0.13333,0.17829 -0.13333,0.4899 0,0.31161 0.13178,0.49144 0.13332,0.17828 0.36432,0.17828 0.22789,0 0.36122,-0.17983 0.13332,-0.17983 0.13332,-0.48989 0,-0.30851 -0.13332,-0.48835 -0.13333,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.0561,-0.63407 v 0.2372 h -0.27285 q -0.15348,0 -0.21394,0.062 -0.0589,0.062 -0.0589,0.22324 v 0.15348 h 0.46974 v 0.22169 h -0.46974 v 1.51464 H 149.565 v -1.51464 h -0.27285 v -0.22169 h 0.27285 v -0.12092 q 0,-0.2899 0.13488,-0.42168 0.13487,-0.13333 0.42788,-0.13333 z m 1.75007,0.31006 q -0.34106,0 -0.5426,0.25425 -0.19999,0.25425 -0.19999,0.69298 0,0.43719 0.19999,0.69143 0.20154,0.25425 0.5426,0.25425 0.34107,0 0.53951,-0.25425 0.19998,-0.25424 0.19998,-0.69143 0,-0.43873 -0.19998,-0.69298 -0.19844,-0.25425 -0.53951,-0.25425 z m 0,-0.25424 q 0.4868,0 0.77825,0.32711 0.29146,0.32556 0.29146,0.87436 0,0.54726 -0.29146,0.87437 -0.29145,0.32556 -0.77825,0.32556 -0.48834,0 -0.78134,-0.32556 -0.29146,-0.32556 -0.29146,-0.87437 0,-0.5488 0.29146,-0.87436 0.293,-0.32711 0.78134,-0.32711 z m 1.46699,0.0419 h 0.42168 l 1.0263,1.93632 v -1.93632 h 0.30386 v 2.31459 h -0.42168 l -1.0263,-1.93632 v 1.93632 h -0.30386 z m 3.05604,0.30851 -0.42478,1.15187 h 0.85111 z m -0.17673,-0.30851 h 0.35502 l 0.88211,2.31459 h -0.32556 l -0.21084,-0.59376 h -1.04334 l -0.21084,0.59376 h -0.33022 z m 1.79565,0.25735 v 0.86972 h 0.39378 q 0.21859,0 0.33796,-0.11317 0.11938,-0.11318 0.11938,-0.32247 0,-0.20774 -0.11938,-0.32091 -0.11937,-0.11317 -0.33796,-0.11317 z m -0.31315,-0.25735 h 0.70693 q 0.38912,0 0.58756,0.17674 0.19999,0.17518 0.19999,0.51469 0,0.34262 -0.19999,0.5178 -0.19844,0.17519 -0.58756,0.17519 h -0.39378 v 0.93017 h -0.31315 z m 4.20728,0.17829 v 0.33021 q -0.15813,-0.14728 -0.33796,-0.22014 -0.17828,-0.0729 -0.37982,-0.0729 -0.39688,0 -0.60772,0.2434 -0.21084,0.24185 -0.21084,0.70073 0,0.45734 0.21084,0.70073 0.21084,0.24185 0.60772,0.24185 0.20154,0 0.37982,-0.0729 0.17983,-0.0729 0.33796,-0.22014 v 0.32711 q -0.16433,0.11162 -0.34881,0.16743 -0.18294,0.0558 -0.38757,0.0558 -0.52555,0 -0.82786,-0.32091 -0.30231,-0.32246 -0.30231,-0.87902 0,-0.5581 0.30231,-0.87901 0.30231,-0.32246 0.82786,-0.32246 0.20773,0 0.39067,0.0558 0.18448,0.0543 0.34571,0.16433 z m 1.05152,0.59996 q -0.22945,0 -0.36277,0.17983 -0.13333,0.17829 -0.13333,0.4899 0,0.31161 0.13178,0.49144 0.13332,0.17828 0.36432,0.17828 0.22789,0 0.36121,-0.17983 0.13333,-0.17983 0.13333,-0.48989 0,-0.30851 -0.13333,-0.48835 -0.13332,-0.18138 -0.36121,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37363,0 -0.58602,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58602,-0.24185 z m 2.52894,0.37518 q 0.10697,-0.19224 0.25579,-0.28371 0.14883,-0.0915 0.35037,-0.0915 0.2713,0 0.41858,0.19069 0.14728,0.18914 0.14728,0.5395 v 1.048 h -0.28681 v -1.0387 q 0,-0.24959 -0.0884,-0.37052 -0.0884,-0.12092 -0.26975,-0.12092 -0.2217,0 -0.35037,0.14728 -0.12867,0.14728 -0.12867,0.40153 v 0.98133 h -0.28681 v -1.0387 q 0,-0.25114 -0.0884,-0.37052 -0.0884,-0.12092 -0.27285,-0.12092 -0.21859,0 -0.34726,0.14883 -0.12868,0.14728 -0.12868,0.39998 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.0977,-0.15968 0.2341,-0.23564 0.13642,-0.076 0.32401,-0.076 0.18913,0 0.32091,0.0961 0.13332,0.0961 0.19689,0.27906 z m 1.92432,1.14256 v 0.92088 h -0.2868 v -2.39676 h 0.2868 v 0.26355 q 0.0899,-0.15503 0.22635,-0.22944 0.13797,-0.076 0.32866,-0.076 0.31626,0 0.51315,0.25115 0.19843,0.25115 0.19843,0.66043 0,0.40927 -0.19843,0.66042 -0.19689,0.25115 -0.51315,0.25115 -0.19069,0 -0.32866,-0.0744 -0.13643,-0.076 -0.22635,-0.231 z m 0.97049,-0.60616 q 0,-0.31471 -0.13023,-0.493 -0.12867,-0.17983 -0.35501,-0.17983 -0.22635,0 -0.35657,0.17983 -0.12868,0.17829 -0.12868,0.493 0,0.31471 0.12868,0.49454 0.13022,0.17828 0.35657,0.17828 0.22634,0 0.35501,-0.17828 0.13023,-0.17983 0.13023,-0.49454 z m 1.34916,-0.66973 q -0.22944,0 -0.36276,0.17983 -0.13333,0.17829 -0.13333,0.4899 0,0.31161 0.13178,0.49144 0.13332,0.17828 0.36431,0.17828 0.2279,0 0.36122,-0.17983 0.13333,-0.17983 0.13333,-0.48989 0,-0.30851 -0.13333,-0.48835 -0.13332,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.62041,0.73019 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15347,0.18448 0.15347,0.54415 z m 1.96154,0.10852 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38293,0.13488 -0.14262,0.13487 -0.16433,0.37982 z m 2.10416,-0.0248 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 0.7585,-1.18132 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.2372,0.0605 h 0.293 v 0.23874 h -0.293 q -0.33022,0 -0.45579,-0.12247 -0.12557,-0.12403 -0.12557,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 1.97704,0.54415 v 0.26975 q -0.12092,-0.062 -0.25115,-0.093 -0.13022,-0.031 -0.26975,-0.031 -0.21239,0 -0.31936,0.0651 -0.10542,0.0651 -0.10542,0.19534 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30386,0.0651 0.43098,0.18449 0.12868,0.11782 0.12868,0.33021 0,0.24185 -0.19224,0.38292 -0.19069,0.14108 -0.52555,0.14108 -0.13953,0 -0.29145,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.3116,0.12403 0.15348,0.0403 0.30386,0.0403 0.20154,0 0.31006,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.0791,-0.17828 -0.0775,-0.062 -0.34262,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38292,-0.17053 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17363,-0.37827 0.17363,-0.13333 0.49299,-0.13333 0.15813,0 0.29766,0.0233 0.13953,0.0232 0.25735,0.0698 z"
            id="text1436-447-9-3-6"
@@ -135,14 +135,15 @@
       <g
          id="g4770"
          inkscape:label="operations"
-         transform="translate(-107.99524,0.06481615)">
+         transform="translate(-112.99525,0.05207315)">
         <path
            id="rect47709-0-3-6-6-6"
            style="display:inline;fill:#5695be;stroke:#5695be;stroke-width:2.00285"
            inkscape:label="operation.form"
-           d="m 279,235 h 49.99715 v 3.99715 H 279 Z" />
+           transform="skewY(-0.01605976)"
+           d="m 279,235.08536 h 50.99715 v 3.99715 H 279 Z" />
         <path
-           d="m 280.25109,235.70693 q -0.34107,0 -0.54261,0.25425 -0.19998,0.25425 -0.19998,0.69298 0,0.43719 0.19998,0.69143 0.20154,0.25425 0.54261,0.25425 0.34106,0 0.5395,-0.25425 0.19999,-0.25424 0.19999,-0.69143 0,-0.43873 -0.19999,-0.69298 -0.19844,-0.25425 -0.5395,-0.25425 z m 0,-0.25424 q 0.48679,0 0.77824,0.32711 0.29146,0.32556 0.29146,0.87436 0,0.54726 -0.29146,0.87437 -0.29145,0.32556 -0.77824,0.32556 -0.48835,0 -0.78135,-0.32556 -0.29146,-0.32556 -0.29146,-0.87437 0,-0.5488 0.29146,-0.87436 0.293,-0.32711 0.78135,-0.32711 z m 1.73054,2.09599 v 0.92088 h -0.28681 v -2.39676 h 0.28681 v 0.26355 q 0.0899,-0.15503 0.22634,-0.22944 0.13798,-0.076 0.32866,-0.076 0.31626,0 0.51315,0.25115 0.19844,0.25115 0.19844,0.66043 0,0.40927 -0.19844,0.66042 -0.19689,0.25115 -0.51315,0.25115 -0.19068,0 -0.32866,-0.0744 -0.13643,-0.076 -0.22634,-0.231 z m 0.97048,-0.60616 q 0,-0.31471 -0.13022,-0.493 -0.12868,-0.17983 -0.35502,-0.17983 -0.22634,0 -0.35657,0.17983 -0.12867,0.17829 -0.12867,0.493 0,0.31471 0.12867,0.49454 0.13023,0.17828 0.35657,0.17828 0.22634,0 0.35502,-0.17828 0.13022,-0.17983 0.13022,-0.49454 z m 2.16152,-0.0729 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 1.66698,-0.44649 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.014 -0.12403,-0.014 -0.24184,0 -0.37207,0.15813 -0.12867,0.15658 -0.12867,0.45114 v 0.91467 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.0899,-0.15813 0.23409,-0.23409 0.14418,-0.0775 0.35037,-0.0775 0.0294,0 0.0651,0.005 0.0357,0.003 0.0791,0.0109 z m 0.9957,0.59687 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28526 v -0.26355 q -0.0977,0.15813 -0.24339,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14883 0.58602,-0.14883 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19534 0.18604,0.19534 0.18604,0.59221 z m 0.77711,-1.23868 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12403 -0.12558,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 0.87012,0.49299 h 0.28526 v 1.73633 h -0.28526 z m 0,-0.67593 h 0.28526 v 0.36122 h -0.28526 z m 1.46234,0.87592 q -0.22944,0 -0.36277,0.17983 -0.13332,0.17829 -0.13332,0.4899 0,0.31161 0.13177,0.49144 0.13333,0.17828 0.36432,0.17828 0.2279,0 0.36122,-0.17983 0.13333,-0.17983 0.13333,-0.48989 0,-0.30851 -0.13333,-0.48835 -0.13332,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.62041,0.73019 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36431,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13952,-0.0775 0.32091,-0.0775 0.2992,0 0.45268,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.58326,-0.63717 v 0.26975 q -0.12092,-0.062 -0.25114,-0.093 -0.13023,-0.031 -0.26975,-0.031 -0.2124,0 -0.31937,0.0651 -0.10542,0.0651 -0.10542,0.19534 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30385,0.0651 0.43098,0.18449 0.12867,0.11782 0.12867,0.33021 0,0.24185 -0.19224,0.38292 -0.19068,0.14108 -0.52554,0.14108 -0.13953,0 -0.29146,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.31161,0.12403 0.15348,0.0403 0.30386,0.0403 0.20153,0 0.31006,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.0791,-0.17828 -0.0775,-0.062 -0.34261,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38293,-0.17053 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17364,-0.37827 0.17363,-0.13333 0.49299,-0.13333 0.15813,0 0.29765,0.0233 0.13953,0.0232 0.25735,0.0698 z"
+           d="m 280.25109,235.70107 q -0.34107,0 -0.54261,0.25425 -0.19998,0.25425 -0.19998,0.69298 0,0.43719 0.19998,0.69143 0.20154,0.25425 0.54261,0.25425 0.34106,0 0.5395,-0.25425 0.19999,-0.25424 0.19999,-0.69143 0,-0.43873 -0.19999,-0.69298 -0.19844,-0.25425 -0.5395,-0.25425 z m 0,-0.25424 q 0.48679,0 0.77824,0.32711 0.29146,0.32556 0.29146,0.87436 0,0.54726 -0.29146,0.87437 -0.29145,0.32556 -0.77824,0.32556 -0.48835,0 -0.78135,-0.32556 -0.29146,-0.32556 -0.29146,-0.87437 0,-0.5488 0.29146,-0.87436 0.293,-0.32711 0.78135,-0.32711 z m 1.73054,2.09599 v 0.92088 h -0.28681 v -2.39676 h 0.28681 v 0.26355 q 0.0899,-0.15503 0.22634,-0.22944 0.13798,-0.076 0.32866,-0.076 0.31626,0 0.51315,0.25114 0.19844,0.25115 0.19844,0.66043 0,0.40928 -0.19844,0.66042 -0.19689,0.25115 -0.51315,0.25115 -0.19068,0 -0.32866,-0.0744 -0.13643,-0.076 -0.22634,-0.231 z m 0.97048,-0.60616 q 0,-0.31471 -0.13022,-0.493 -0.12868,-0.17983 -0.35502,-0.17983 -0.22634,0 -0.35657,0.17983 -0.12867,0.17829 -0.12867,0.493 0,0.31471 0.12867,0.49454 0.13023,0.17828 0.35657,0.17828 0.22634,0 0.35502,-0.17828 0.13022,-0.17983 0.13022,-0.49454 z m 2.16152,-0.0729 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44959 0.15968,0.15347 0.44338,0.15347 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25114 0.62167,-0.25114 0.35036,0 0.55345,0.22634 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 1.66698,-0.44649 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.014 -0.12403,-0.014 -0.24184,0 -0.37207,0.15813 -0.12867,0.15658 -0.12867,0.45114 v 0.91467 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.0899,-0.15813 0.23409,-0.23409 0.14418,-0.0775 0.35037,-0.0775 0.0294,0 0.0651,0.005 0.0357,0.003 0.0791,0.0109 z m 0.9957,0.59687 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28526 v -0.26355 q -0.0977,0.15813 -0.24339,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14883 0.58602,-0.14883 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19533 0.18604,0.19534 0.18604,0.59221 z m 0.77711,-1.23868 v 0.49299 h 0.58756 v 0.2217 h -0.58756 v 0.94257 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12403 -0.12558,-0.44959 v -0.94257 h -0.20929 v -0.2217 h 0.20929 v -0.49299 z m 0.87012,0.49299 h 0.28526 v 1.73633 h -0.28526 z m 0,-0.67592 h 0.28526 v 0.36121 h -0.28526 z m 1.46234,0.87591 q -0.22944,0 -0.36277,0.17984 -0.13332,0.17828 -0.13332,0.48989 0,0.31161 0.13177,0.49144 0.13333,0.17828 0.36432,0.17828 0.2279,0 0.36122,-0.17983 0.13333,-0.17983 0.13333,-0.48989 0,-0.30851 -0.13333,-0.48834 -0.13332,-0.18139 -0.36122,-0.18139 z m 0,-0.24184 q 0.37207,0 0.58446,0.24184 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24184 0.58601,-0.24184 z m 2.62041,0.73018 v 1.048 h -0.28525 v -1.03869 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12248 -0.28836,-0.12248 -0.23099,0 -0.36431,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13952,-0.0775 0.32091,-0.0775 0.2992,0 0.45268,0.18603 0.15348,0.18449 0.15348,0.54415 z m 1.58326,-0.63717 v 0.26975 q -0.12092,-0.062 -0.25114,-0.093 -0.13023,-0.031 -0.26975,-0.031 -0.2124,0 -0.31937,0.0651 -0.10542,0.0651 -0.10542,0.19534 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30385,0.0651 0.43098,0.18449 0.12867,0.11782 0.12867,0.33021 0,0.24185 -0.19224,0.38292 -0.19068,0.14108 -0.52554,0.14108 -0.13953,0 -0.29146,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.31161,0.12403 0.15348,0.0403 0.30386,0.0403 0.20153,0 0.31006,-0.0682 0.10852,-0.0698 0.10852,-0.19533 0,-0.11628 -0.0791,-0.17829 -0.0775,-0.062 -0.34261,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38293,-0.17053 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17364,-0.37827 0.17363,-0.13332 0.49299,-0.13332 0.15813,0 0.29765,0.0232 0.13953,0.0232 0.25735,0.0698 z"
            id="text1436-0-1-7"
            style="font-size:3.175px;line-height:1.25;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#ffffff;stroke-width:0.264583"
            inkscape:label="operations.label"
@@ -152,14 +153,14 @@
       <g
          id="g4776"
          inkscape:label="orchestrationmanagement"
-         transform="translate(-111.99809,0.06481615)">
+         transform="translate(-117.9981,0.05207315)">
         <path
            id="rect47709-0-3-6-6"
            style="display:inline;fill:#009893;stroke:#009893;stroke-width:2.00285"
            inkscape:label="orchestrationmanagement.form"
-           d="M 231.00285,235 H 281 v 3.99715 h -49.99715 z" />
+           d="m 231.00429,235.00142 h 50.99715 v 3.99715 h -50.99715 z" />
         <path
-           d="m 232.25304,235.70693 q -0.34106,0 -0.5426,0.25425 -0.19999,0.25425 -0.19999,0.69298 0,0.43719 0.19999,0.69143 0.20154,0.25425 0.5426,0.25425 0.34106,0 0.5395,-0.25425 0.19999,-0.25424 0.19999,-0.69143 0,-0.43873 -0.19999,-0.69298 -0.19844,-0.25425 -0.5395,-0.25425 z m 0,-0.25424 q 0.48679,0 0.77825,0.32711 0.29145,0.32556 0.29145,0.87436 0,0.54726 -0.29145,0.87437 -0.29146,0.32556 -0.77825,0.32556 -0.48834,0 -0.78135,-0.32556 -0.29145,-0.32556 -0.29145,-0.87437 0,-0.5488 0.29145,-0.87436 0.29301,-0.32711 0.78135,-0.32711 z m 2.46073,0.88676 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.014 -0.12403,-0.014 -0.24184,0 -0.37207,0.15813 -0.12867,0.15658 -0.12867,0.45114 v 0.91467 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.0899,-0.15813 0.23409,-0.23409 0.14418,-0.0775 0.35037,-0.0775 0.0295,0 0.0651,0.005 0.0357,0.003 0.0791,0.0109 z m 1.38637,-0.19998 v 0.26665 q -0.12092,-0.0667 -0.24339,-0.0992 -0.12093,-0.0341 -0.24495,-0.0341 -0.2775,0 -0.43098,0.17673 -0.15348,0.17519 -0.15348,0.493 0,0.31781 0.15348,0.49454 0.15348,0.17518 0.43098,0.17518 0.12402,0 0.24495,-0.0326 0.12247,-0.0341 0.24339,-0.10077 v 0.26355 q -0.11937,0.0558 -0.24804,0.0837 -0.12713,0.0279 -0.27131,0.0279 -0.39222,0 -0.62321,-0.2465 -0.231,-0.24649 -0.231,-0.66507 0,-0.42478 0.23255,-0.66818 0.23409,-0.2434 0.64027,-0.2434 0.13177,0 0.25735,0.0279 0.12557,0.0264 0.24339,0.0806 z m 1.84682,0.62166 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -2.41226 h 0.2868 v 0.94568 q 0.10232,-0.15658 0.2403,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.96153,0.10852 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17673,0.44958 0.15969,0.15348 0.44339,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38293,0.13488 -0.14262,0.13487 -0.16433,0.37982 z m 1.76774,-0.66198 v 0.26975 q -0.12092,-0.062 -0.25114,-0.093 -0.13023,-0.031 -0.26976,-0.031 -0.21239,0 -0.31936,0.0651 -0.10542,0.0651 -0.10542,0.19534 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30386,0.0651 0.43099,0.18449 0.12867,0.11782 0.12867,0.33021 0,0.24185 -0.19224,0.38292 -0.19068,0.14108 -0.52555,0.14108 -0.13952,0 -0.29145,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.31161,0.12403 0.15348,0.0403 0.30386,0.0403 0.20153,0 0.31005,-0.0682 0.10853,-0.0698 0.10853,-0.19534 0,-0.11627 -0.0791,-0.17828 -0.0775,-0.062 -0.34261,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38293,-0.17053 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17363,-0.37827 0.17364,-0.13333 0.493,-0.13333 0.15813,0 0.29765,0.0233 0.13953,0.0232 0.25735,0.0698 z m 0.73681,-0.54415 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12403 -0.12558,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 1.87626,0.75964 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.014 -0.12402,-0.014 -0.24185,0 -0.37207,0.15813 -0.12867,0.15658 -0.12867,0.45114 v 0.91467 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.0899,-0.15813 0.23409,-0.23409 0.14418,-0.0775 0.35037,-0.0775 0.0294,0 0.0651,0.005 0.0357,0.003 0.0791,0.0109 z m 0.9957,0.59687 q -0.34571,0 -0.47904,0.0791 -0.13332,0.0791 -0.13332,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.23719,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.2434,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19534,-0.44184 0.19689,-0.14883 0.58601,-0.14883 h 0.39998 v -0.0279 q 0,-0.19689 -0.13023,-0.30386 -0.12867,-0.10852 -0.36277,-0.10852 -0.14882,0 -0.2899,0.0357 -0.14108,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14727,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19534 0.18603,0.19534 0.18603,0.59221 z m 0.77711,-1.23868 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.2372,0.0605 h 0.293 v 0.23874 h -0.293 q -0.33021,0 -0.45579,-0.12247 -0.12557,-0.12403 -0.12557,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z m 0.87013,0.49299 h 0.28525 v 1.73633 h -0.28525 z m 0,-0.67593 h 0.28525 v 0.36122 h -0.28525 z m 1.46234,0.87592 q -0.22944,0 -0.36277,0.17983 -0.13333,0.17829 -0.13333,0.4899 0,0.31161 0.13178,0.49144 0.13332,0.17828 0.36432,0.17828 0.22789,0 0.36122,-0.17983 0.13332,-0.17983 0.13332,-0.48989 0,-0.30851 -0.13332,-0.48835 -0.13333,-0.18138 -0.36122,-0.18138 z m 0,-0.24185 q 0.37207,0 0.58446,0.24185 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66972 -0.21239,0.24185 -0.58446,0.24185 -0.37362,0 -0.58601,-0.24185 -0.21084,-0.24339 -0.21084,-0.66972 0,-0.42788 0.21084,-0.66973 0.21239,-0.24185 0.58601,-0.24185 z m 2.62041,0.73019 v 1.048 h -0.28526 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.60125,-0.19688 q -0.14108,0.12557 -0.20774,0.25114 -0.0651,0.12403 -0.0651,0.26045 0,0.22635 0.16433,0.37672 0.16434,0.15038 0.41238,0.15038 0.14728,0 0.27595,-0.0481 0.12868,-0.0496 0.24185,-0.14883 z m 0.21859,-0.17364 0.78755,0.80616 q 0.0915,-0.13798 0.14262,-0.29456 0.0512,-0.15813 0.0605,-0.33486 h 0.28836 q -0.0186,0.20463 -0.0992,0.40462 -0.0806,0.19999 -0.22479,0.39533 l 0.43253,0.44183 h -0.39068 l -0.22169,-0.22789 q -0.16123,0.13797 -0.33796,0.20619 -0.17673,0.0667 -0.37982,0.0667 -0.37362,0 -0.61082,-0.21239 -0.23719,-0.21394 -0.23719,-0.54725 0,-0.19844 0.10387,-0.37207 0.10387,-0.17519 0.31161,-0.32867 -0.0744,-0.0977 -0.11318,-0.19378 -0.0387,-0.0977 -0.0387,-0.19069 0,-0.25115 0.17208,-0.40308 0.17208,-0.15347 0.45734,-0.15347 0.12867,0 0.25579,0.0279 0.12868,0.0279 0.26045,0.0837 v 0.28215 q -0.13487,-0.0729 -0.25735,-0.11007 -0.12247,-0.0388 -0.22789,-0.0388 -0.16278,0 -0.2651,0.0868 -0.10077,0.0853 -0.10077,0.22169 0,0.0791 0.045,0.15968 0.0465,0.0791 0.18759,0.22479 z m 2.35623,-0.89607 h 0.46664 l 0.59066,1.5751 0.59377,-1.5751 h 0.46664 v 2.31459 h -0.30541 v -2.03243 l -0.59687,1.5875 h -0.3147 l -0.59687,-1.5875 v 2.03243 h -0.30386 z m 3.42346,1.44178 q -0.34571,0 -0.47904,0.0791 -0.13332,0.0791 -0.13332,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.23719,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.2434,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19534,-0.44184 0.19689,-0.14883 0.58601,-0.14883 h 0.39998 v -0.0279 q 0,-0.19689 -0.13023,-0.30386 -0.12867,-0.10852 -0.36277,-0.10852 -0.14882,0 -0.2899,0.0357 -0.14108,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14727,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19534 0.18603,0.19534 0.18603,0.59221 z m 1.93828,-0.0574 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28835,-0.12247 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.23409 0.13952,-0.0775 0.32091,-0.0775 0.2992,0 0.45268,0.18604 0.15348,0.18448 0.15348,0.54415 z m 1.26545,0.17519 q -0.34571,0 -0.47904,0.0791 -0.13332,0.0791 -0.13332,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.23719,0 0.37982,-0.16743 0.14418,-0.16898 0.14418,-0.44803 v -0.0636 z m 0.56896,-0.11783 v 0.99064 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.2434,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15038 -0.15658,-0.40152 0,-0.29301 0.19534,-0.44184 0.19689,-0.14883 0.58601,-0.14883 h 0.39998 v -0.0279 q 0,-0.19689 -0.13023,-0.30386 -0.12867,-0.10852 -0.36277,-0.10852 -0.14882,0 -0.2899,0.0357 -0.14108,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14727,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19534 0.18603,0.19534 0.18603,0.59221 z m 1.63752,0.10232 q 0,-0.31006 -0.12867,-0.48059 -0.12713,-0.17053 -0.35812,-0.17053 -0.22944,0 -0.35812,0.17053 -0.12712,0.17053 -0.12712,0.48059 0,0.30851 0.12712,0.47904 0.12868,0.17054 0.35812,0.17054 0.23099,0 0.35812,-0.17054 0.12867,-0.17053 0.12867,-0.47904 z m 0.28526,0.67283 q 0,0.44338 -0.19689,0.65887 -0.19689,0.21705 -0.60306,0.21705 -0.15038,0 -0.28371,-0.0233 -0.13332,-0.0217 -0.2589,-0.0682 v -0.2775 q 0.12558,0.0682 0.24805,0.10076 0.12247,0.0326 0.2496,0.0326 0.2806,0 0.42013,-0.14728 0.13952,-0.14572 0.13952,-0.44183 v -0.14108 q -0.0884,0.15348 -0.22634,0.22945 -0.13798,0.076 -0.33021,0.076 -0.31936,0 -0.5147,-0.2434 -0.19534,-0.24339 -0.19534,-0.64492 0,-0.40307 0.19534,-0.64647 0.19534,-0.2434 0.5147,-0.2434 0.19223,0 0.33021,0.076 0.13798,0.076 0.22634,0.22944 v -0.26355 h 0.28526 z m 1.98014,-0.72399 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17673,0.44958 0.15968,0.15348 0.44339,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30695,-0.12093 v 0.26975 q -0.15347,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65887,-0.24185 -0.24185,-0.24184 -0.24185,-0.65422 0,-0.42633 0.22945,-0.67593 0.23099,-0.25115 0.62166,-0.25115 0.35037,0 0.55346,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28526,-0.0837 q -0.003,-0.2341 -0.13177,-0.37362 -0.12713,-0.13953 -0.33797,-0.13953 -0.23874,0 -0.38292,0.13488 -0.14262,0.13487 -0.16433,0.37982 z m 2.0127,-0.37982 q 0.10697,-0.19224 0.25579,-0.28371 0.14883,-0.0915 0.35037,-0.0915 0.2713,0 0.41858,0.19069 0.14728,0.18914 0.14728,0.5395 v 1.048 h -0.28681 v -1.0387 q 0,-0.24959 -0.0884,-0.37052 -0.0884,-0.12092 -0.26975,-0.12092 -0.2217,0 -0.35037,0.14728 -0.12868,0.14728 -0.12868,0.40153 v 0.98133 h -0.2868 v -1.0387 q 0,-0.25114 -0.0884,-0.37052 -0.0884,-0.12092 -0.27285,-0.12092 -0.21859,0 -0.34726,0.14883 -0.12868,0.14728 -0.12868,0.39998 v 0.98133 h -0.2868 v -1.73633 h 0.2868 v 0.26975 q 0.0977,-0.15968 0.2341,-0.23564 0.13642,-0.076 0.32401,-0.076 0.18913,0 0.32091,0.0961 0.13332,0.0961 0.19689,0.27906 z m 3.13355,0.46353 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17674,0.44958 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24185 -0.24184,-0.24184 -0.24184,-0.65422 0,-0.42633 0.22944,-0.67593 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28525,-0.0837 q -0.003,-0.2341 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38293,0.13488 -0.14262,0.13487 -0.16433,0.37982 z m 2.10416,-0.0248 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z m 0.7585,-1.18132 v 0.49299 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.2372,0.0605 h 0.293 v 0.23874 h -0.293 q -0.33021,0 -0.45579,-0.12247 -0.12557,-0.12403 -0.12557,-0.44959 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.49299 z"
+           d="m 232.25499,235.70889 q -0.34106,0 -0.5426,0.25424 -0.19999,0.25425 -0.19999,0.69299 0,0.43718 0.19999,0.69143 0.20154,0.25424 0.5426,0.25424 0.34107,0 0.5395,-0.25424 0.19999,-0.25425 0.19999,-0.69143 0,-0.43874 -0.19999,-0.69299 -0.19843,-0.25424 -0.5395,-0.25424 z m 0,-0.25425 q 0.48679,0 0.77825,0.32711 0.29145,0.32556 0.29145,0.87437 0,0.54725 -0.29145,0.87436 -0.29146,0.32556 -0.77825,0.32556 -0.48834,0 -0.78134,-0.32556 -0.29146,-0.32556 -0.29146,-0.87436 0,-0.54881 0.29146,-0.87437 0.293,-0.32711 0.78134,-0.32711 z m 2.46073,0.88677 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.0139 -0.12402,-0.0139 -0.24185,0 -0.37207,0.15813 -0.12868,0.15658 -0.12868,0.45113 v 0.91467 h -0.2868 v -1.73632 h 0.2868 v 0.26975 q 0.0899,-0.15813 0.2341,-0.2341 0.14417,-0.0775 0.35036,-0.0775 0.0295,0 0.0651,0.005 0.0357,0.003 0.0791,0.0108 z m 1.38638,-0.19999 v 0.26665 q -0.12093,-0.0667 -0.2434,-0.0992 -0.12092,-0.0341 -0.24495,-0.0341 -0.2775,0 -0.43098,0.17674 -0.15348,0.17518 -0.15348,0.49299 0,0.31781 0.15348,0.49454 0.15348,0.17519 0.43098,0.17519 0.12403,0 0.24495,-0.0326 0.12247,-0.0341 0.2434,-0.10077 v 0.26355 q -0.11938,0.0558 -0.24805,0.0837 -0.12712,0.0279 -0.2713,0.0279 -0.39223,0 -0.62322,-0.24649 -0.23099,-0.2465 -0.23099,-0.66508 0,-0.42478 0.23254,-0.66818 0.23409,-0.24339 0.64027,-0.24339 0.13178,0 0.25735,0.0279 0.12557,0.0264 0.2434,0.0806 z m 1.84681,0.62167 v 1.04799 h -0.28526 v -1.03869 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12248 -0.28836,-0.12248 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -2.41225 h 0.28681 v 0.94568 q 0.10232,-0.15658 0.24029,-0.2341 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18603 0.15348,0.18449 0.15348,0.54416 z m 1.96153,0.10852 v 0.13952 h -1.31155 q 0.0186,0.29456 0.17674,0.44959 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12092 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24184 -0.24184,-0.24185 -0.24184,-0.65423 0,-0.42633 0.22944,-0.67592 0.231,-0.25115 0.62167,-0.25115 0.35037,0 0.55345,0.22634 0.20464,0.22479 0.20464,0.61237 z m -0.28525,-0.0837 q -0.003,-0.23409 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 1.76775,-0.66197 v 0.26975 q -0.12093,-0.062 -0.25115,-0.093 -0.13023,-0.031 -0.26975,-0.031 -0.21239,0 -0.31936,0.0651 -0.10542,0.0651 -0.10542,0.19533 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30386,0.0651 0.43098,0.18448 0.12867,0.11782 0.12867,0.33021 0,0.24185 -0.19223,0.38293 -0.19069,0.14107 -0.52555,0.14107 -0.13953,0 -0.29146,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29455 q 0.15813,0.0822 0.31161,0.12402 0.15348,0.0403 0.30386,0.0403 0.20154,0 0.31006,-0.0682 0.10852,-0.0698 0.10852,-0.19533 0,-0.11627 -0.0791,-0.17829 -0.0775,-0.062 -0.34261,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38292,-0.17054 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17363,-0.37827 0.17363,-0.13332 0.49299,-0.13332 0.15813,0 0.29766,0.0232 0.13952,0.0233 0.25735,0.0698 z m 0.7368,-0.54416 v 0.493 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12402 -0.12558,-0.44958 v -0.94258 h -0.20928 v -0.22169 h 0.20928 v -0.493 z m 1.87627,0.75965 q -0.0481,-0.0279 -0.10542,-0.0403 -0.0558,-0.0139 -0.12403,-0.0139 -0.24184,0 -0.37207,0.15813 -0.12867,0.15658 -0.12867,0.45113 v 0.91467 h -0.28681 v -1.73632 h 0.28681 v 0.26975 q 0.0899,-0.15813 0.23409,-0.2341 0.14418,-0.0775 0.35037,-0.0775 0.0294,0 0.0651,0.005 0.0357,0.003 0.0791,0.0108 z m 0.9957,0.59686 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16899 0.14418,-0.44804 v -0.0636 z m 0.56895,-0.11782 v 0.99063 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.2434,0.2341 -0.14572,0.0744 -0.35656,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15037 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14882 0.58602,-0.14882 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19533 0.18603,0.19534 0.18603,0.59222 z m 0.77712,-1.23869 v 0.493 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45579,-0.12247 -0.12557,-0.12402 -0.12557,-0.44958 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.493 z m 0.87012,0.493 h 0.28526 v 1.73632 h -0.28526 z m 0,-0.67593 h 0.28526 v 0.36122 h -0.28526 z m 1.46234,0.87591 q -0.22944,0 -0.36277,0.17984 -0.13332,0.17828 -0.13332,0.48989 0,0.31161 0.13177,0.49144 0.13333,0.17829 0.36432,0.17829 0.22789,0 0.36122,-0.17984 0.13333,-0.17983 0.13333,-0.48989 0,-0.30851 -0.13333,-0.48834 -0.13333,-0.18139 -0.36122,-0.18139 z m 0,-0.24184 q 0.37207,0 0.58446,0.24184 0.21239,0.24185 0.21239,0.66973 0,0.42633 -0.21239,0.66973 -0.21239,0.24184 -0.58446,0.24184 -0.37362,0 -0.58601,-0.24184 -0.21084,-0.2434 -0.21084,-0.66973 0,-0.42788 0.21084,-0.66973 0.21239,-0.24184 0.58601,-0.24184 z m 2.62041,0.73019 v 1.04799 h -0.28525 v -1.03869 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12248 -0.28835,-0.12248 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73632 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.2341 0.13952,-0.0775 0.32091,-0.0775 0.2992,0 0.45268,0.18603 0.15348,0.18449 0.15348,0.54416 z m 1.60125,-0.19689 q -0.14108,0.12557 -0.20774,0.25115 -0.0651,0.12402 -0.0651,0.26045 0,0.22634 0.16433,0.37672 0.16433,0.15037 0.41238,0.15037 0.14727,0 0.27595,-0.0481 0.12867,-0.0496 0.24184,-0.14883 z m 0.21859,-0.17363 0.78755,0.80615 q 0.0915,-0.13798 0.14263,-0.29456 0.0512,-0.15813 0.0605,-0.33486 h 0.28835 q -0.0186,0.20464 -0.0992,0.40463 -0.0806,0.19998 -0.22479,0.39532 l 0.43253,0.44183 h -0.39067 l -0.22169,-0.22789 q -0.16123,0.13798 -0.33797,0.20619 -0.17673,0.0667 -0.37982,0.0667 -0.37362,0 -0.61082,-0.21239 -0.23719,-0.21394 -0.23719,-0.54725 0,-0.19844 0.10387,-0.37207 0.10387,-0.17518 0.31161,-0.32866 -0.0744,-0.0977 -0.11317,-0.19379 -0.0388,-0.0977 -0.0388,-0.19069 0,-0.25114 0.17208,-0.40307 0.17208,-0.15348 0.45734,-0.15348 0.12867,0 0.2558,0.0279 0.12867,0.0279 0.26045,0.0837 v 0.28215 q -0.13488,-0.0729 -0.25735,-0.11007 -0.12248,-0.0388 -0.2279,-0.0388 -0.16278,0 -0.2651,0.0868 -0.10076,0.0853 -0.10076,0.22169 0,0.0791 0.045,0.15968 0.0465,0.0791 0.18759,0.2248 z m 2.35624,-0.89607 h 0.46664 l 0.59066,1.57509 0.59376,-1.57509 h 0.46664 v 2.31458 h -0.30541 v -2.03243 l -0.59686,1.5875 h -0.31471 l -0.59686,-1.5875 v 2.03243 h -0.30386 z m 3.42346,1.44177 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16899 0.14418,-0.44804 v -0.0636 z m 0.56896,-0.11782 v 0.99063 h -0.28526 v -0.26355 q -0.0977,0.15813 -0.24339,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15037 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14882 0.58602,-0.14882 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19533 0.18604,0.19534 0.18604,0.59222 z m 1.93828,-0.0574 v 1.04799 h -0.28526 v -1.03869 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12248 -0.28835,-0.12248 -0.23099,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73632 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.2341 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18603 0.15348,0.18449 0.15348,0.54416 z m 1.26545,0.17518 q -0.34572,0 -0.47904,0.0791 -0.13333,0.0791 -0.13333,0.26975 0,0.15193 0.0992,0.24185 0.10077,0.0884 0.27285,0.0884 0.2372,0 0.37982,-0.16743 0.14418,-0.16899 0.14418,-0.44804 v -0.0636 z m 0.56895,-0.11782 v 0.99063 h -0.28525 v -0.26355 q -0.0977,0.15813 -0.24339,0.2341 -0.14573,0.0744 -0.35657,0.0744 -0.26665,0 -0.42478,-0.14883 -0.15658,-0.15037 -0.15658,-0.40152 0,-0.29301 0.19533,-0.44184 0.19689,-0.14882 0.58602,-0.14882 h 0.39997 v -0.0279 q 0,-0.19689 -0.13022,-0.30386 -0.12868,-0.10852 -0.36277,-0.10852 -0.14883,0 -0.28991,0.0357 -0.14107,0.0357 -0.2713,0.10697 v -0.26355 q 0.15658,-0.0605 0.30386,-0.0899 0.14728,-0.031 0.2868,-0.031 0.37672,0 0.56276,0.19533 0.18603,0.19534 0.18603,0.59222 z m 1.63753,0.10232 q 0,-0.31006 -0.12868,-0.48059 -0.12712,-0.17054 -0.35812,-0.17054 -0.22944,0 -0.35811,0.17054 -0.12713,0.17053 -0.12713,0.48059 0,0.3085 0.12713,0.47904 0.12867,0.17053 0.35811,0.17053 0.231,0 0.35812,-0.17053 0.12868,-0.17054 0.12868,-0.47904 z m 0.28525,0.67282 q 0,0.44339 -0.19689,0.65888 -0.19688,0.21704 -0.60306,0.21704 -0.15038,0 -0.2837,-0.0233 -0.13333,-0.0217 -0.2589,-0.0682 v -0.2775 q 0.12557,0.0682 0.24804,0.10077 0.12248,0.0326 0.2496,0.0326 0.2806,0 0.42013,-0.14727 0.13953,-0.14573 0.13953,-0.44184 v -0.14107 q -0.0884,0.15348 -0.22635,0.22944 -0.13797,0.076 -0.33021,0.076 -0.31936,0 -0.5147,-0.24339 -0.19533,-0.2434 -0.19533,-0.64492 0,-0.40308 0.19533,-0.64648 0.19534,-0.24339 0.5147,-0.24339 0.19224,0 0.33021,0.076 0.13798,0.076 0.22635,0.22945 v -0.26355 h 0.28525 z m 1.98014,-0.72398 v 0.13952 h -1.31155 q 0.0186,0.29456 0.17674,0.44959 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12092 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24184 -0.24184,-0.24185 -0.24184,-0.65423 0,-0.42633 0.22944,-0.67592 0.23099,-0.25115 0.62167,-0.25115 0.35036,0 0.55345,0.22634 0.20464,0.22479 0.20464,0.61237 z m -0.28525,-0.0837 q -0.003,-0.23409 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16434,0.37982 z m 2.01269,-0.37982 q 0.10697,-0.19224 0.2558,-0.2837 0.14883,-0.0915 0.35036,-0.0915 0.2713,0 0.41858,0.19068 0.14728,0.18914 0.14728,0.53951 v 1.04799 h -0.2868 v -1.03869 q 0,-0.2496 -0.0884,-0.37052 -0.0884,-0.12093 -0.26975,-0.12093 -0.22169,0 -0.35037,0.14728 -0.12867,0.14728 -0.12867,0.40153 v 0.98133 h -0.28681 v -1.03869 q 0,-0.25115 -0.0884,-0.37052 -0.0884,-0.12093 -0.27285,-0.12093 -0.2186,0 -0.34727,0.14883 -0.12867,0.14728 -0.12867,0.39998 v 0.98133 h -0.28681 v -1.73632 h 0.28681 v 0.26975 q 0.0977,-0.15968 0.23409,-0.23565 0.13643,-0.076 0.32401,-0.076 0.18914,0 0.32091,0.0961 0.13333,0.0961 0.19689,0.27905 z m 3.13355,0.46354 v 0.13952 h -1.31155 q 0.0186,0.29456 0.17674,0.44959 0.15968,0.15348 0.44338,0.15348 0.16433,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12092 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65888,-0.24184 -0.24184,-0.24185 -0.24184,-0.65423 0,-0.42633 0.22944,-0.67592 0.231,-0.25115 0.62167,-0.25115 0.35037,0 0.55345,0.22634 0.20464,0.22479 0.20464,0.61237 z m -0.28525,-0.0837 q -0.003,-0.23409 -0.13178,-0.37362 -0.12712,-0.13953 -0.33796,-0.13953 -0.23875,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 2.10416,-0.0248 v 1.04799 h -0.28525 v -1.03869 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12248 -0.28835,-0.12248 -0.231,0 -0.36432,0.14728 -0.13333,0.14728 -0.13333,0.40153 v 0.98133 h -0.2868 v -1.73632 h 0.2868 v 0.26975 q 0.10232,-0.15658 0.2403,-0.2341 0.13952,-0.0775 0.32091,-0.0775 0.2992,0 0.45268,0.18603 0.15348,0.18449 0.15348,0.54416 z m 0.75851,-1.18133 v 0.493 h 0.58756 v 0.22169 h -0.58756 v 0.94258 q 0,0.21239 0.0574,0.27285 0.0589,0.0605 0.23719,0.0605 h 0.29301 v 0.23874 h -0.29301 q -0.33021,0 -0.45578,-0.12247 -0.12558,-0.12402 -0.12558,-0.44958 v -0.94258 h -0.20929 v -0.22169 h 0.20929 v -0.493 z"
            id="text1436-0-1"
            style="font-size:3.175px;line-height:1.25;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#ffffff;stroke-width:0.264583"
            inkscape:label="orchestrationmanagement.label"
@@ -169,12 +170,12 @@
       <g
          id="g4765"
          inkscape:label="design"
-         transform="translate(-115.99524,0.06481615)">
+         transform="translate(-122.99524,0.05207315)">
         <path
            id="rect47709-0-9-8-2"
            style="display:inline;fill:#1a3d6f;stroke:#1a3d6f;stroke-width:2"
            inkscape:label="design.form"
-           d="m 183,235 h 50 v 4 h -50 z" />
+           d="m 183,235 h 51 v 4 h -51 z" />
         <path
            d="m 183.62477,235.75189 v 1.79989 h 0.37827 q 0.47904,0 0.70073,-0.21704 0.22324,-0.21704 0.22324,-0.68523 0,-0.46509 -0.22324,-0.68058 -0.22169,-0.21704 -0.70073,-0.21704 z m -0.31316,-0.25735 h 0.64337 q 0.67283,0 0.98754,0.28061 0.31471,0.27905 0.31471,0.87436 0,0.59841 -0.31626,0.87902 -0.31626,0.2806 -0.98599,0.2806 h -0.64337 z m 3.82499,1.37511 v 0.13953 h -1.31155 q 0.0186,0.29456 0.17673,0.44958 0.15968,0.15348 0.44338,0.15348 0.16434,0 0.31781,-0.0403 0.15503,-0.0403 0.30696,-0.12093 v 0.26975 q -0.15348,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.32711,0.0341 -0.41548,0 -0.65887,-0.24185 -0.24185,-0.24184 -0.24185,-0.65422 0,-0.42633 0.22944,-0.67593 0.231,-0.25115 0.62167,-0.25115 0.35037,0 0.55346,0.22635 0.20464,0.22479 0.20464,0.61236 z m -0.28526,-0.0837 q -0.003,-0.2341 -0.13177,-0.37362 -0.12713,-0.13953 -0.33797,-0.13953 -0.23874,0 -0.38292,0.13488 -0.14263,0.13487 -0.16433,0.37982 z m 1.76775,-0.66198 v 0.26975 q -0.12092,-0.062 -0.25115,-0.093 -0.13022,-0.031 -0.26975,-0.031 -0.21239,0 -0.31936,0.0651 -0.10542,0.0651 -0.10542,0.19534 0,0.0992 0.076,0.15658 0.076,0.0558 0.30541,0.10697 l 0.0977,0.0217 q 0.30386,0.0651 0.43098,0.18449 0.12868,0.11782 0.12868,0.33021 0,0.24185 -0.19224,0.38292 -0.19069,0.14108 -0.52555,0.14108 -0.13953,0 -0.29145,-0.0279 -0.15038,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.3116,0.12403 0.15348,0.0403 0.30386,0.0403 0.20154,0 0.31006,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.0791,-0.17828 -0.0775,-0.062 -0.34262,-0.11937 l -0.0992,-0.0233 q -0.2651,-0.0558 -0.38292,-0.17053 -0.11782,-0.11627 -0.11782,-0.31781 0,-0.24494 0.17363,-0.37827 0.17363,-0.13333 0.49299,-0.13333 0.15813,0 0.29766,0.0233 0.13953,0.0232 0.25735,0.0698 z m 0.45465,-0.0512 h 0.28525 v 1.73633 h -0.28525 z m 0,-0.67593 h 0.28525 v 0.36122 h -0.28525 z m 1.93208,1.52394 q 0,-0.31006 -0.12868,-0.48059 -0.12712,-0.17053 -0.35812,-0.17053 -0.22944,0 -0.35811,0.17053 -0.12713,0.17053 -0.12713,0.48059 0,0.30851 0.12713,0.47904 0.12867,0.17054 0.35811,0.17054 0.231,0 0.35812,-0.17054 0.12868,-0.17053 0.12868,-0.47904 z m 0.28525,0.67283 q 0,0.44338 -0.19689,0.65887 -0.19688,0.21705 -0.60306,0.21705 -0.15038,0 -0.2837,-0.0233 -0.13333,-0.0217 -0.2589,-0.0682 v -0.2775 q 0.12557,0.0682 0.24804,0.10076 0.12248,0.0326 0.2496,0.0326 0.2806,0 0.42013,-0.14728 0.13953,-0.14572 0.13953,-0.44183 v -0.14108 q -0.0884,0.15348 -0.22635,0.22945 -0.13797,0.076 -0.33021,0.076 -0.31936,0 -0.5147,-0.2434 -0.19533,-0.24339 -0.19533,-0.64492 0,-0.40307 0.19533,-0.64647 0.19534,-0.2434 0.5147,-0.2434 0.19224,0 0.33021,0.076 0.13798,0.076 0.22635,0.22944 v -0.26355 h 0.28525 z m 1.93828,-0.83251 v 1.048 h -0.28525 v -1.0387 q 0,-0.24649 -0.0961,-0.36897 -0.0961,-0.12247 -0.28836,-0.12247 -0.23099,0 -0.36432,0.14728 -0.13332,0.14728 -0.13332,0.40153 v 0.98133 h -0.28681 v -1.73633 h 0.28681 v 0.26975 q 0.10232,-0.15658 0.24029,-0.23409 0.13953,-0.0775 0.32091,-0.0775 0.29921,0 0.45269,0.18604 0.15348,0.18448 0.15348,0.54415 z"
            id="text1436-1-6-8"
@@ -185,14 +186,15 @@
       <g
          id="g4781"
          inkscape:label="3rdparty"
-         style="display:inline">
+         style="display:inline;stroke-width:0.99989"
+         transform="matrix(1.0002198,0,0,1,-0.00153984,0)">
         <path
            id="rect47709-1-8-8-2-3"
-           style="display:inline;fill:#8c8c8c;stroke:#8c8c8c;stroke-width:1.98725;stop-color:#000000"
+           style="display:inline;fill:#8c8c8c;stroke:#8c8c8c;stroke-width:1.98703;stop-color:#000000"
            inkscape:label="3rdparty.form"
-           d="M 7.0047631,235.05206 H 65.004763 v 4.01276 H 7.0047631 Z" />
+           d="M 7.0047607,235.05206 H 58.006084 v 4.01276 H 7.0047607 Z" />
         <path
-           style="font-size:3.175px;line-height:1.25;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#f9f9f9;stroke-width:0.264583"
+           style="font-size:3.175px;line-height:1.25;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#f9f9f9;stroke-width:0.264554"
            d="m 8.2921997,236.61388 q 0.2247925,0.0481 0.3503662,0.19999 0.127124,0.15193 0.127124,0.37517 0,0.34261 -0.2356445,0.5302 -0.2356445,0.18758 -0.6697266,0.18758 -0.1457275,0 -0.3007568,-0.0294 -0.153479,-0.0279 -0.3178101,-0.0853 v -0.30231 q 0.1302247,0.076 0.285254,0.11473 0.1550292,0.0387 0.3240112,0.0387 0.2945556,0 0.4480346,-0.11627 0.1550293,-0.11627 0.1550293,-0.33796 0,-0.20464 -0.1441772,-0.31936 -0.142627,-0.11627 -0.3984253,-0.11627 h -0.269751 v -0.25735 h 0.2821533 q 0.2309937,0 0.3534668,-0.0915 0.1224732,-0.093 0.1224732,-0.26665 0,-0.17828 -0.127124,-0.27285 -0.1255738,-0.0961 -0.3612183,-0.0961 -0.1286743,0 -0.2759521,0.0279 -0.1472779,0.0279 -0.3240113,0.0868 v -0.27905 q 0.1782837,-0.0496 0.333313,-0.0744 0.1565796,-0.0248 0.2945557,-0.0248 0.3565674,0 0.5643066,0.16278 0.2077393,0.16123 0.2077393,0.43718 0,0.19224 -0.1100708,0.32556 -0.1100708,0.13178 -0.3131592,0.18294 z m 1.9444803,-0.22169 q -0.04806,-0.0279 -0.105419,-0.0403 -0.05581,-0.0139 -0.124024,-0.0139 -0.2418456,0 -0.3720702,0.15813 -0.1286743,0.15658 -0.1286743,0.45113 v 0.91468 H 9.2196883 v -1.73633 h 0.2868042 v 0.26975 q 0.089917,-0.15813 0.2340942,-0.2341 0.1441772,-0.0775 0.3503663,-0.0775 0.02945,0 0.06511,0.005 0.03566,0.003 0.07906,0.0108 z m 1.293358,-0.003 v -0.93948 h 0.285254 v 2.41226 h -0.285254 v -0.26045 q -0.08992,0.15503 -0.227893,0.23099 -0.136426,0.0744 -0.328662,0.0744 -0.31471,0 -0.513147,-0.25114 -0.196887,-0.25115 -0.196887,-0.66043 0,-0.40928 0.196887,-0.66042 0.198437,-0.25115 0.513147,-0.25115 0.192236,0 0.328662,0.076 0.137976,0.0744 0.227893,0.22945 z m -0.972034,0.60616 q 0,0.31471 0.128675,0.49454 0.130224,0.17829 0.356567,0.17829 0.226343,0 0.356567,-0.17829 0.130225,-0.17983 0.130225,-0.49454 0,-0.31471 -0.130225,-0.49299 -0.130224,-0.17984 -0.356567,-0.17984 -0.226343,0 -0.356567,0.17984 -0.128675,0.17828 -0.128675,0.49299 z m 2.72986,-1.19062 v 0.86971 h 0.393774 q 0.218592,0 0.337964,-0.11317 0.119373,-0.11317 0.119373,-0.32246 0,-0.20774 -0.119373,-0.32091 -0.119372,-0.11317 -0.337964,-0.11317 z m -0.313159,-0.25735 h 0.706933 q 0.389124,0 0.587561,0.17673 0.199988,0.17518 0.199988,0.5147 0,0.34261 -0.199988,0.5178 -0.198437,0.17518 -0.587561,0.17518 h -0.393774 v 0.93018 h -0.313159 z m 2.456077,1.44177 q -0.345715,0 -0.479041,0.0791 -0.133325,0.0791 -0.133325,0.26975 0,0.15192 0.09922,0.24184 0.100769,0.0884 0.272852,0.0884 0.237194,0 0.379821,-0.16743 0.144178,-0.16898 0.144178,-0.44804 v -0.0636 z m 0.568958,-0.11782 v 0.99064 h -0.285254 v -0.26355 q -0.09767,0.15813 -0.243396,0.23409 -0.145728,0.0744 -0.356568,0.0744 -0.26665,0 -0.42478,-0.14882 -0.15658,-0.15038 -0.15658,-0.40153 0,-0.29301 0.195337,-0.44183 0.196888,-0.14883 0.586011,-0.14883 h 0.399976 v -0.0279 q 0,-0.19688 -0.130225,-0.30385 -0.128674,-0.10853 -0.362769,-0.10853 -0.148828,0 -0.289904,0.0357 -0.141077,0.0357 -0.271302,0.10697 v -0.26355 q 0.15658,-0.0605 0.303858,-0.0899 0.147278,-0.031 0.286804,-0.031 0.376721,0 0.562756,0.19534 0.186036,0.19533 0.186036,0.59221 z m 1.501097,-0.47904 q -0.04806,-0.0279 -0.10542,-0.0403 -0.05581,-0.0139 -0.124024,-0.0139 -0.241846,0 -0.37207,0.15813 -0.128674,0.15658 -0.128674,0.45113 v 0.91468 h -0.286805 v -1.73633 h 0.286805 v 0.26975 q 0.08992,-0.15813 0.234094,-0.2341 0.144177,-0.0775 0.350366,-0.0775 0.02946,0 0.06511,0.005 0.03566,0.003 0.07906,0.0108 z m 0.488756,-0.75965 v 0.493 h 0.587561 v 0.22169 h -0.587561 v 0.94258 q 0,0.21239 0.05736,0.27285 0.05891,0.0605 0.237195,0.0605 h 0.293006 v 0.23875 h -0.293006 q -0.330212,0 -0.455786,-0.12248 -0.125574,-0.12402 -0.125574,-0.44958 v -0.94258 h -0.209289 v -0.22169 h 0.209289 v -0.493 z m 1.592564,2.39056 q -0.120923,0.31005 -0.235645,0.40462 -0.114722,0.0946 -0.306958,0.0946 h -0.227893 v -0.23875 h 0.167432 q 0.117822,0 0.182934,-0.0558 0.06511,-0.0558 0.144177,-0.26355 l 0.05116,-0.13022 -0.702283,-1.70842 h 0.302307 l 0.542603,1.35805 0.542603,-1.35805 h 0.302307 z"
            id="text1436-447-9-3-5"
            inkscape:label="3rdparty.label"
@@ -547,51 +549,32 @@
         </g>
       </g>
     </g>
-    <g
-       id="g1"
-       inkscape:label="infrastructureservice"
-       style="display:inline">
-      <a
-         id="a6"
-         xlink:title="To be done"
-         inkscape:label="servicemesh.link"
-         onmouseover="style.opacity = 0.6;"
-         onmouseout="style.opacity = 1.0;"
-         style="display:inline">
-        <g
-           id="g7029-1"
-           inkscape:label="servicemesh"
-           style="display:inline"
-           transform="translate(-0.02480324,58.751175)">
-          <path
-             id="rect13557-2-5-3-2"
-             style="vector-effect:none;fill:#8c8c8c;stroke:#8c8c8c;stroke-width:2;stop-color:#000000"
-             inkscape:label="servicemesh.form"
-             d="M 81.029564,104.24883 H 257.00457 v 12 H 81.029564 Z" />
-          <path
-             d="m 82.728418,104.50105 v 0.30541 q -0.178284,-0.0853 -0.336414,-0.12712 -0.15813,-0.0419 -0.305407,-0.0419 -0.255799,0 -0.395325,0.0992 -0.137976,0.0992 -0.137976,0.28215 0,0.15348 0.09147,0.23255 0.09302,0.0775 0.350366,0.12557 l 0.189136,0.0388 q 0.350366,0.0667 0.516248,0.23564 0.167431,0.16743 0.167431,0.44959 0,0.33641 -0.226342,0.51004 -0.224793,0.17364 -0.660425,0.17364 -0.164331,0 -0.350366,-0.0372 -0.184485,-0.0372 -0.382923,-0.11007 v -0.32246 q 0.190686,0.10697 0.373621,0.16123 0.182934,0.0543 0.359668,0.0543 0.2682,0 0.413928,-0.10542 0.145727,-0.10542 0.145727,-0.30076 0,-0.17053 -0.105419,-0.26665 -0.10387,-0.0961 -0.342615,-0.14418 l -0.190686,-0.0372 q -0.350366,-0.0698 -0.506946,-0.21859 -0.15658,-0.14883 -0.15658,-0.41393 0,-0.30696 0.215491,-0.48369 0.217041,-0.17674 0.596863,-0.17674 0.162781,0 0.331763,0.0295 0.168982,0.0294 0.345715,0.0884 z m 2.008043,1.29915 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176733,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.161231,0.0341 -0.327112,0.0341 -0.415479,0 -0.658875,-0.24185 -0.241845,-0.24185 -0.241845,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z M 86.118185,105.27 q -0.04806,-0.0279 -0.10542,-0.0403 -0.05581,-0.014 -0.124023,-0.014 -0.241846,0 -0.37207,0.15813 -0.128675,0.15658 -0.128675,0.45113 v 0.91468 h -0.286804 v -1.73633 h 0.286804 v 0.26975 q 0.08992,-0.15813 0.234094,-0.23409 0.144178,-0.0775 0.350367,-0.0775 0.02945,0 0.06511,0.005 0.03566,0.003 0.07906,0.0109 z m 0.002,-0.26665 h 0.302307 l 0.542602,1.45727 0.542603,-1.45727 h 0.302307 l -0.651123,1.73633 h -0.387573 z m 1.990989,0 h 0.285254 v 1.73633 h -0.285254 z m 0,-0.67593 h 0.285254 v 0.36122 h -0.285254 z m 2.039049,0.74259 v 0.26665 q -0.120923,-0.0667 -0.243396,-0.0992 -0.120923,-0.0341 -0.244946,-0.0341 -0.277503,0 -0.430982,0.17673 -0.153479,0.17518 -0.153479,0.49299 0,0.31781 0.153479,0.49455 0.153479,0.17518 0.430982,0.17518 0.124023,0 0.244946,-0.0326 0.122473,-0.0341 0.243396,-0.10076 v 0.26355 q -0.119373,0.0558 -0.248047,0.0837 -0.127124,0.0279 -0.271301,0.0279 -0.392224,0 -0.623218,-0.2465 -0.230994,-0.2465 -0.230994,-0.66508 0,-0.42478 0.232544,-0.66817 0.234095,-0.2434 0.640271,-0.2434 0.131775,0 0.257349,0.0279 0.125574,0.0263 0.243396,0.0806 z m 1.88867,0.73019 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443383,0.15348 0.164331,0 0.31781,-0.0403 0.15503,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.325294,-1.29139 h 0.466638 l 0.590662,1.5751 0.593762,-1.5751 h 0.466638 v 2.31459 H 94.89119 v -2.03244 l -0.596863,1.5875 h -0.31471 l -0.596862,-1.5875 v 2.03244 h -0.303858 z m 4.119542,1.37511 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553455,0.22634 0.204638,0.2248 0.204638,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337963,-0.13952 -0.238746,0 -0.382923,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.767747,-0.66197 v 0.26975 q -0.120923,-0.062 -0.251147,-0.093 -0.130225,-0.031 -0.269751,-0.031 -0.21239,0 -0.319361,0.0651 -0.105419,0.0651 -0.105419,0.19534 0,0.0992 0.07596,0.15658 0.07596,0.0558 0.305408,0.10697 l 0.09767,0.0217 q 0.303857,0.0651 0.430981,0.18448 0.128675,0.11783 0.128675,0.33022 0,0.24184 -0.192237,0.38292 -0.190686,0.14108 -0.525549,0.14108 -0.139526,0 -0.291455,-0.0279 -0.150378,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.311609,0.12402 0.153479,0.0403 0.303857,0.0403 0.201538,0 0.310059,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.07906,-0.17828 -0.07751,-0.062 -0.342614,-0.11938 l -0.09922,-0.0233 q -0.2651,-0.0558 -0.382922,-0.17053 -0.117823,-0.11627 -0.117823,-0.31781 0,-0.24495 0.173633,-0.37827 0.173633,-0.13333 0.492993,-0.13333 0.15813,0 0.297657,0.0233 0.139526,0.0232 0.257348,0.0698 z m 1.897968,0.63717 v 1.048 h -0.28525 v -1.0387 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12247 -0.288353,-0.12247 -0.230994,0 -0.364319,0.14728 -0.133325,0.14727 -0.133325,0.40152 v 0.98134 h -0.286804 v -2.41226 h 0.286804 v 0.94568 q 0.102319,-0.15658 0.240295,-0.23409 0.139527,-0.0775 0.320911,-0.0775 0.299211,0 0.452681,0.18604 0.15348,0.18448 0.15348,0.54415 z"
-             id="text1436-447-86-9-9"
-             style="font-size:3.175px;line-height:1.05;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#fffffb;stroke-width:0.264583"
-             inkscape:label="servicemesh.label"
-             aria-label="Service Mesh" />
-        </g>
-      </a>
-      <a
-         id="a7"
-         xlink:title="To be done"
-         xlink:href="infrastructure%20service%20link"
-         inkscape:label="infrastructureservice.link"
+    <a
+       id="a6"
+       xlink:title="Service Mesh: To be done"
+       inkscape:label="servicemesh.link"
+       onmouseover="style.opacity = 0.6;"
+       onmouseout="style.opacity = 1.0;"
+       style="display:inline"
+       xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html">
+      <g
+         id="g7029-1"
+         inkscape:label="servicemesh"
          style="display:inline"
-         onmouseover="style.opacity = 0.6;"
-         onmouseout="style.opacity = 1.0;">
+         transform="translate(-0.02480324,58.751175)">
         <path
-           id="rect55176-2-4"
-           style="display:inline;fill:none;stroke:#8c8c8c;stroke-width:2;paint-order:stroke fill markers;stop-color:#000000"
-           inkscape:label="infrastructureservice.form"
-           transform="translate(-4e-7,39.000008)"
-           d="M 7.0047593,120 H 325.00476 v 20 H 7.0047593 Z" />
-      </a>
-    </g>
+           id="rect13557-2-5-3-2"
+           style="vector-effect:none;fill:#8c8c8c;stroke:#8c8c8c;stroke-width:2;stop-color:#000000"
+           inkscape:label="servicemesh.form"
+           d="M 81.029564,104.24883 H 257.00457 v 12 H 81.029564 Z" />
+        <path
+           d="m 82.728418,104.50105 v 0.30541 q -0.178284,-0.0853 -0.336414,-0.12712 -0.15813,-0.0419 -0.305407,-0.0419 -0.255799,0 -0.395325,0.0992 -0.137976,0.0992 -0.137976,0.28215 0,0.15348 0.09147,0.23255 0.09302,0.0775 0.350366,0.12557 l 0.189136,0.0388 q 0.350366,0.0667 0.516248,0.23564 0.167431,0.16743 0.167431,0.44959 0,0.33641 -0.226342,0.51004 -0.224793,0.17364 -0.660425,0.17364 -0.164331,0 -0.350366,-0.0372 -0.184485,-0.0372 -0.382923,-0.11007 v -0.32246 q 0.190686,0.10697 0.373621,0.16123 0.182934,0.0543 0.359668,0.0543 0.2682,0 0.413928,-0.10542 0.145727,-0.10542 0.145727,-0.30076 0,-0.17053 -0.105419,-0.26665 -0.10387,-0.0961 -0.342615,-0.14418 l -0.190686,-0.0372 q -0.350366,-0.0698 -0.506946,-0.21859 -0.15658,-0.14883 -0.15658,-0.41393 0,-0.30696 0.215491,-0.48369 0.217041,-0.17674 0.596863,-0.17674 0.162781,0 0.331763,0.0295 0.168982,0.0294 0.345715,0.0884 z m 2.008043,1.29915 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176733,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.161231,0.0341 -0.327112,0.0341 -0.415479,0 -0.658875,-0.24185 -0.241845,-0.24185 -0.241845,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.666978,-0.4465 q -0.04806,-0.0279 -0.10542,-0.0403 -0.05581,-0.014 -0.124023,-0.014 -0.241846,0 -0.37207,0.15813 -0.128675,0.15658 -0.128675,0.45113 v 0.91468 h -0.286804 v -1.73633 h 0.286804 v 0.26975 q 0.08992,-0.15813 0.234094,-0.23409 0.144178,-0.0775 0.350367,-0.0775 0.02945,0 0.06511,0.005 0.03566,0.003 0.07906,0.0109 z m 0.002,-0.26665 h 0.302307 l 0.542602,1.45727 0.542603,-1.45727 h 0.302307 l -0.651123,1.73633 h -0.387573 z m 1.990989,0 h 0.285254 v 1.73633 h -0.285254 z m 0,-0.67593 h 0.285254 v 0.36122 h -0.285254 z m 2.039049,0.74259 v 0.26665 q -0.120923,-0.0667 -0.243396,-0.0992 -0.120923,-0.0341 -0.244946,-0.0341 -0.277503,0 -0.430982,0.17673 -0.153479,0.17518 -0.153479,0.49299 0,0.31781 0.153479,0.49455 0.153479,0.17518 0.430982,0.17518 0.124023,0 0.244946,-0.0326 0.122473,-0.0341 0.243396,-0.10076 v 0.26355 q -0.119373,0.0558 -0.248047,0.0837 -0.127124,0.0279 -0.271301,0.0279 -0.392224,0 -0.623218,-0.2465 -0.230994,-0.2465 -0.230994,-0.66508 0,-0.42478 0.232544,-0.66817 0.234095,-0.2434 0.640271,-0.2434 0.131775,0 0.257349,0.0279 0.125574,0.0263 0.243396,0.0806 z m 1.88867,0.73019 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443383,0.15348 0.164331,0 0.31781,-0.0403 0.15503,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.325294,-1.29139 h 0.466638 l 0.590662,1.5751 0.593762,-1.5751 h 0.466638 v 2.31459 H 94.89119 v -2.03244 l -0.596863,1.5875 h -0.31471 l -0.596862,-1.5875 v 2.03244 h -0.303858 z m 4.119542,1.37511 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553455,0.22634 0.204638,0.2248 0.204638,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337963,-0.13952 -0.238746,0 -0.382923,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.767747,-0.66197 v 0.26975 q -0.120923,-0.062 -0.251147,-0.093 -0.130225,-0.031 -0.269751,-0.031 -0.21239,0 -0.319361,0.0651 -0.105419,0.0651 -0.105419,0.19534 0,0.0992 0.07596,0.15658 0.07596,0.0558 0.305408,0.10697 l 0.09767,0.0217 q 0.303857,0.0651 0.430981,0.18448 0.128675,0.11783 0.128675,0.33022 0,0.24184 -0.192237,0.38292 -0.190686,0.14108 -0.525549,0.14108 -0.139526,0 -0.291455,-0.0279 -0.150378,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.311609,0.12402 0.153479,0.0403 0.303857,0.0403 0.201538,0 0.310059,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.07906,-0.17828 -0.07751,-0.062 -0.342614,-0.11938 l -0.09922,-0.0233 q -0.2651,-0.0558 -0.382922,-0.17053 -0.117823,-0.11627 -0.117823,-0.31781 0,-0.24495 0.173633,-0.37827 0.173633,-0.13333 0.492993,-0.13333 0.15813,0 0.297657,0.0233 0.139526,0.0232 0.257348,0.0698 z m 1.897972,0.63717 v 1.048 h -0.28525 v -1.0387 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12247 -0.288357,-0.12247 -0.230994,0 -0.364319,0.14728 -0.133325,0.14727 -0.133325,0.40152 v 0.98134 h -0.286804 v -2.41226 h 0.286804 v 0.94568 q 0.102319,-0.15658 0.240295,-0.23409 0.139527,-0.0775 0.320911,-0.0775 0.299215,0 0.452685,0.18604 0.15348,0.18448 0.15348,0.54415 z"
+           id="text1436-447-86-9-9"
+           style="font-size:3.175px;line-height:1.05;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#fffffb;stroke-width:0.264583"
+           inkscape:label="servicemesh.label"
+           aria-label="Service Mesh" />
+      </g>
+    </a>
     <a
        id="a5443"
        inkscape:label="onapborder.link"
@@ -898,13 +881,13 @@
            onmouseover="style.opacity = 0.6;"
            onmouseout="style.opacity = 1.0;"
            xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html#shared-services"
-           xlink:title="To be done"
+           xlink:title="Security Framework: To be done"
            transform="translate(-2.1000011e-7,18)"
            style="display:inline">
           <g
              id="g1912-5"
              inkscape:label="security-framework"
-             transform="translate(0,-10)">
+             transform="translate(-1.422182e-5,6.0000053)">
             <path
                id="rect47709-1-2-6"
                style="display:inline;opacity:1;vector-effect:none;fill:#66c1be;stroke:#66c1be;stroke-width:2;stop-color:#000000;stop-opacity:1"
@@ -923,9 +906,9 @@
            inkscape:label="logging-framework.link"
            onmouseover="style.opacity = 0.6;"
            onmouseout="style.opacity = 1.0;"
-           xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html#shared-services"
-           xlink:title="To be done"
-           transform="translate(1.9467032e-6,25.000008)"
+           xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+           xlink:title="Logging Framework: To be done"
+           transform="translate(-1.5909867e-5,42.000006)"
            style="display:inline">
           <g
              id="g1912-5-8"
@@ -1177,8 +1160,8 @@
          inkscape:label="strimzikafka.link"
          onmouseover="style.opacity = 0.6;"
          onmouseout="style.opacity = 1.0;"
-         xlink:href="https://docs.onap.org/en/latest/platform/components/index.html"
-         xlink:title="To be done: Strimzi / Kafka">
+         xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+         xlink:title="Strimzi / Kafka: To be done">
         <g
            id="g7029"
            inkscape:label="strimzikafka"
@@ -1307,7 +1290,7 @@
                id="rect13557-2"
                style="fill:#009893;stroke:#009893;stroke-width:2"
                inkscape:label="policyframework.form"
-               d="m 81,88.932762 h 41 V 100.93276 H 81 Z" />
+               d="m 81,88.932762 h 41 V 101 H 81 Z" />
             <g
                id="text1436-5"
                style="font-size:3.175px;line-height:1.25;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#ffffff;stroke-width:0.264583"
@@ -1350,7 +1333,7 @@
          id="g5379"
          inkscape:label="interfaces"
          style="display:inline"
-         transform="translate(0,0.06723675)">
+         transform="translate(-8.9952373,0.06724082)">
         <a
            id="a4558"
            inkscape:label="interfaces.link"
@@ -1360,14 +1343,16 @@
            xlink:title="Various ONAP components provide also a user interface.">
           <g
              id="g5413"
-             inkscape:label="interfaces">
+             inkscape:label="interfaces"
+             transform="matrix(1.0456852,0,0,1,-2.6954277,0)"
+             style="stroke-width:0.977911">
             <path
                id="rect13557-1-3"
-               style="display:inline;opacity:0.4;fill:#009893;stroke:#009893;stroke-width:4;stop-color:#000000"
+               style="display:inline;opacity:0.4;fill:#009893;stroke:#009893;stroke-width:3.91165;stop-color:#000000"
                inkscape:label="interfaces.form"
                d="M 59,71.932762 H 256 V 81.932764 H 59 Z" />
             <path
-               style="font-weight:bold;font-size:3.175px;line-height:1.25;-inkscape-font-specification:'sans-serif Bold';letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#ffffff;stroke-width:0.264583"
+               style="font-weight:bold;font-size:3.175px;line-height:1.25;-inkscape-font-specification:'sans-serif Bold';letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#ffffff;stroke-width:0.258739"
                d="m 59.291455,72.428137 h 0.596863 v 2.314588 h -0.596863 z m 2.809544,1.257288 v 1.0573 h -0.558105 v -0.172083 -0.63717 q 0,-0.224793 -0.01085,-0.310059 -0.0093,-0.08527 -0.03411,-0.125574 -0.03256,-0.05426 -0.08837,-0.08371 -0.05581,-0.03101 -0.127124,-0.03101 -0.173633,0 -0.272852,0.134875 -0.09922,0.133325 -0.09922,0.37052 v 0.854212 h -0.555005 v -1.736329 h 0.555005 v 0.254249 q 0.125574,-0.151929 0.266651,-0.223243 0.141076,-0.07286 0.311609,-0.07286 0.300756,0 0.455786,0.184484 0.156579,0.184485 0.156579,0.536402 z m 1.028258,-1.172022 v 0.492993 h 0.572058 v 0.396875 h -0.572058 v 0.73639 q 0,0.120922 0.04806,0.164331 0.04806,0.04186 0.190686,0.04186 h 0.285254 v 0.396875 h -0.47594 q -0.328662,0 -0.466638,-0.136426 -0.136426,-0.137976 -0.136426,-0.466638 v -0.73639 H 62.2983 v -0.396875 h 0.275952 v -0.492993 z m 2.552195,1.356507 v 0.15813 h -1.297595 q 0.02015,0.195336 0.141077,0.293005 0.120923,0.09767 0.337964,0.09767 0.175183,0 0.358117,-0.05116 0.184485,-0.05271 0.378272,-0.15813 v 0.427881 q -0.196887,0.07441 -0.393775,0.111621 -0.196887,0.03876 -0.393774,0.03876 -0.471289,0 -0.733289,-0.238745 Q 63.818,74.308643 63.818,73.876111 q 0,-0.42478 0.255798,-0.668176 0.257349,-0.243396 0.706934,-0.243396 0.409277,0 0.654224,0.246496 0.246496,0.246497 0.246496,0.658875 z m -0.570508,-0.184485 q 0,-0.15813 -0.09302,-0.254248 -0.09147,-0.09767 -0.240296,-0.09767 -0.16123,0 -0.261999,0.09147 -0.100769,0.08992 -0.125574,0.260449 z m 2.187877,-0.206189 q -0.07286,-0.03411 -0.145727,-0.04961 -0.07131,-0.01705 -0.144177,-0.01705 -0.213941,0 -0.330213,0.137976 -0.114722,0.136426 -0.114722,0.392224 v 0.799952 h -0.555004 v -1.736329 h 0.555004 v 0.285254 q 0.106971,-0.170532 0.244947,-0.248047 0.139526,-0.07906 0.333313,-0.07906 0.02791,0 0.06046,0.0031 0.03256,0.0015 0.09457,0.0093 z m 1.325914,-1.148767 v 0.364319 h -0.306958 q -0.117822,0 -0.164331,0.04341 -0.04651,0.04186 -0.04651,0.147278 v 0.120922 h 0.47439 v 0.396875 h -0.47439 v 1.339454 H 67.551933 V 73.403271 H 67.27598 v -0.396875 h 0.275953 v -0.120922 q 0,-0.283704 0.158129,-0.418579 0.15813,-0.136426 0.489893,-0.136426 z m 0.924388,1.630908 q -0.173633,0 -0.261999,0.05891 -0.08682,0.05891 -0.08682,0.173633 0,0.10542 0.06976,0.165881 0.07131,0.05891 0.196888,0.05891 0.156579,0 0.263549,-0.111621 0.106971,-0.113171 0.106971,-0.282153 v -0.06356 z m 0.84801,-0.20929 v 0.990638 h -0.559655 v -0.257349 q -0.111621,0.15813 -0.251148,0.230994 -0.139526,0.07131 -0.339514,0.07131 -0.269751,0 -0.438733,-0.15658 -0.167431,-0.158129 -0.167431,-0.409277 0,-0.305408 0.209289,-0.448035 0.21084,-0.142626 0.660425,-0.142626 h 0.327112 v -0.04341 q 0,-0.131775 -0.10387,-0.192236 -0.10387,-0.06201 -0.324011,-0.06201 -0.178284,0 -0.331763,0.03566 -0.153479,0.03566 -0.285254,0.10697 v -0.42323 q 0.178284,-0.04341 0.358118,-0.06511 0.179834,-0.02325 0.359668,-0.02325 0.469739,0 0.677478,0.186035 0.209289,0.184485 0.209289,0.601513 z m 1.826659,-0.69143 v 0.452685 q -0.113171,-0.07751 -0.227893,-0.114721 -0.113171,-0.03721 -0.235644,-0.03721 -0.232544,0 -0.362769,0.136425 -0.128674,0.134876 -0.128674,0.378272 0,0.243396 0.128674,0.379822 0.130225,0.134875 0.362769,0.134875 0.130224,0 0.246496,-0.03876 0.117822,-0.03876 0.217041,-0.114722 v 0.454236 q -0.130224,0.04806 -0.2651,0.07131 -0.133325,0.02481 -0.268201,0.02481 -0.469738,0 -0.734838,-0.240295 -0.2651,-0.241846 -0.2651,-0.671277 0,-0.429431 0.2651,-0.669727 0.2651,-0.241845 0.734838,-0.241845 0.136426,0 0.268201,0.0248 0.133325,0.02325 0.2651,0.07131 z m 2.119663,0.809253 v 0.15813 H 73.04586 q 0.02015,0.195336 0.141077,0.293005 0.120923,0.09767 0.337964,0.09767 0.175183,0 0.358117,-0.05116 0.184485,-0.05271 0.378272,-0.15813 v 0.427881 q -0.196887,0.07441 -0.393775,0.111621 -0.196887,0.03876 -0.393774,0.03876 -0.471289,0 -0.733289,-0.238745 -0.260449,-0.240295 -0.260449,-0.672827 0,-0.42478 0.255799,-0.668176 0.257348,-0.243396 0.706933,-0.243396 0.409277,0 0.654224,0.246496 0.246496,0.246497 0.246496,0.658875 z m -0.570508,-0.184485 q 0,-0.15813 -0.09302,-0.254248 -0.09147,-0.09767 -0.240296,-0.09767 -0.16123,0 -0.261999,0.09147 -0.100769,0.08992 -0.125574,0.260449 z m 2.25454,-0.624768 v 0.421679 q -0.178284,-0.07441 -0.344165,-0.111621 -0.165881,-0.03721 -0.313159,-0.03721 -0.15813,0 -0.235645,0.04031 -0.07596,0.03876 -0.07596,0.120923 0,0.06666 0.05736,0.102319 0.05891,0.03566 0.209289,0.05271 l 0.09767,0.01395 q 0.42633,0.05426 0.573608,0.178283 0.147278,0.124024 0.147278,0.389124 0,0.277502 -0.204639,0.417029 -0.204638,0.139526 -0.610815,0.139526 -0.172083,0 -0.356568,-0.02791 -0.182934,-0.02635 -0.376721,-0.08061 v -0.42168 q 0.165882,0.08062 0.339514,0.120923 0.175184,0.04031 0.355018,0.04031 0.16278,0 0.244946,-0.04496 0.08217,-0.04496 0.08217,-0.133325 0,-0.07441 -0.05736,-0.110071 -0.05581,-0.03721 -0.224792,-0.05736 l -0.09767,-0.0124 q -0.37052,-0.04651 -0.519349,-0.172083 -0.148828,-0.125574 -0.148828,-0.381372 0,-0.275952 0.189136,-0.409277 0.189136,-0.133325 0.57981,-0.133325 0.153479,0 0.322461,0.02325 0.168981,0.02325 0.367419,0.07286 z"
                id="text1842"
                inkscape:label="interfaces.label"
@@ -1565,19 +1550,26 @@
         </g>
       </g>
     </a>
-    <g
-       id="text4"
-       style="font-size:6.35px;line-height:1.25;fill:#999999;stroke-width:0.264583"
-       aria-label="Infrastructure&#10;Service">
+    <a
+       id="a1"
+       xlink:title="Infrastructure Service: To be done"
+       xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+       onmouseover="style.opacity = 0.6;"
+       onmouseout="style.opacity = 1.0;"
+       inkscape:label="infrastructureservice">
       <path
-         style="font-weight:bold;font-family:Sans;-inkscape-font-specification:'Sans Bold'"
-         d="m 12.709891,162.45968 h 1.193725 v 4.62917 h -1.193725 z m 5.804297,2.51457 v 2.1146 h -1.116211 v -0.34416 -1.27434 q 0,-0.44959 -0.0217,-0.62012 -0.0186,-0.17053 -0.06821,-0.25115 -0.06511,-0.10852 -0.176734,-0.16743 -0.111621,-0.062 -0.254248,-0.062 -0.347265,0 -0.545703,0.26975 -0.198437,0.26665 -0.198437,0.74104 v 1.70842 h -1.11001 v -3.47265 h 1.11001 v 0.50849 q 0.251147,-0.30386 0.5333,-0.44648 0.282154,-0.14573 0.623218,-0.14573 0.601514,0 0.911572,0.36897 0.31316,0.36897 0.31316,1.0728 z m 3.314526,-2.70991 v 0.72864 h -0.613916 q -0.235644,0 -0.328662,0.0868 -0.09302,0.0837 -0.09302,0.29456 v 0.24185 h 0.94878 v 0.79375 h -0.94878 v 2.6789 h -1.110009 v -2.6789 h -0.551905 v -0.79375 h 0.551905 v -0.24185 q 0,-0.56741 0.316259,-0.83716 0.31626,-0.27285 0.979786,-0.27285 z m 3.057178,2.29753 q -0.145728,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288355,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229443,0.27285 -0.229443,0.78445 v 1.5999 h -1.11001 v -3.47265 h 1.11001 v 0.5705 q 0.21394,-0.34106 0.489893,-0.49609 0.279052,-0.15813 0.666626,-0.15813 0.05581,0 0.120922,0.006 0.06511,0.003 0.189136,0.0186 z m 2.108398,0.96429 q -0.347265,0 -0.523999,0.11782 -0.173633,0.11782 -0.173633,0.34726 0,0.21084 0.139527,0.33177 0.142627,0.11782 0.393774,0.11782 0.313159,0 0.5271,-0.22324 0.21394,-0.22635 0.21394,-0.56431 v -0.12712 z m 1.696021,-0.41858 v 1.98127 h -1.119312 v -0.5147 q -0.223242,0.31626 -0.502295,0.46199 -0.279053,0.14263 -0.679028,0.14263 -0.539502,0 -0.877466,-0.31316 -0.334863,-0.31626 -0.334863,-0.81855 0,-0.61082 0.418579,-0.89607 0.42168,-0.28526 1.320849,-0.28526 h 0.654224 v -0.0868 q 0,-0.26355 -0.207739,-0.38448 -0.207739,-0.12402 -0.648023,-0.12402 -0.356567,0 -0.663525,0.0713 -0.306958,0.0713 -0.570508,0.21394 v -0.84646 q 0.356568,-0.0868 0.716236,-0.13022 0.359668,-0.0465 0.719335,-0.0465 0.939478,0 1.354957,0.37207 0.418579,0.36897 0.418579,1.20303 z m 3.745508,-1.38286 v 0.84336 q -0.356567,-0.14883 -0.68833,-0.22325 -0.331763,-0.0744 -0.626318,-0.0744 -0.31626,0 -0.471289,0.0806 -0.151929,0.0775 -0.151929,0.24185 0,0.13333 0.114722,0.20464 0.117822,0.0713 0.418579,0.10542 l 0.195337,0.0279 q 0.852661,0.10852 1.147216,0.35657 0.294556,0.24805 0.294556,0.77825 0,0.555 -0.409277,0.83406 -0.409278,0.27905 -1.221631,0.27905 -0.344165,0 -0.713135,-0.0558 -0.365869,-0.0527 -0.753442,-0.16123 v -0.84336 q 0.331762,0.16123 0.679028,0.24184 0.350366,0.0806 0.710034,0.0806 0.325562,0 0.489893,-0.0899 0.164331,-0.0899 0.164331,-0.26665 0,-0.14883 -0.114722,-0.22014 -0.111621,-0.0744 -0.449585,-0.11472 l -0.195337,-0.0248 q -0.74104,-0.093 -1.038696,-0.34416 -0.297656,-0.25115 -0.297656,-0.76275 0,-0.5519 0.378271,-0.81855 0.378272,-0.26665 1.159619,-0.26665 0.306958,0 0.644922,0.0465 0.337964,0.0465 0.734839,0.14573 z m 2.27893,-1.09451 v 0.98599 h 1.144116 v 0.79375 h -1.144116 v 1.47277 q 0,0.24185 0.09612,0.32867 0.09612,0.0837 0.381372,0.0837 h 0.570508 v 0.79375 h -0.95188 q -0.657324,0 -0.933276,-0.27285 -0.272852,-0.27595 -0.272852,-0.93328 v -1.47277 h -0.551904 v -0.79375 h 0.551904 v -0.98599 z m 4.402833,1.93166 q -0.145727,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288354,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229444,0.27285 -0.229444,0.78445 v 1.5999 h -1.110009 v -3.47265 h 1.110009 v 0.5705 q 0.213941,-0.34106 0.489893,-0.49609 0.279053,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189135,0.0186 z m 0.514697,1.17513 v -2.1208 h 1.116211 v 0.34726 q 0,0.28215 -0.0031,0.71004 -0.0031,0.42478 -0.0031,0.5674 0,0.41858 0.0217,0.60462 0.0217,0.18293 0.07441,0.26665 0.06821,0.10852 0.176734,0.16743 0.111621,0.0589 0.254248,0.0589 0.347265,0 0.545703,-0.26665 0.198437,-0.26665 0.198437,-0.74104 v -1.71462 h 1.11001 v 3.47265 h -1.11001 v -0.50229 q -0.251147,0.30385 -0.5333,0.44958 -0.279053,0.14263 -0.617017,0.14263 -0.601514,0 -0.917773,-0.36897 -0.31316,-0.36897 -0.31316,-1.0728 z m 7.36389,-2.01228 v 0.90537 q -0.226342,-0.15503 -0.455786,-0.22945 -0.226342,-0.0744 -0.471289,-0.0744 -0.465088,0 -0.725537,0.27285 -0.257348,0.26975 -0.257348,0.75654 0,0.4868 0.257348,0.75965 0.260449,0.26975 0.725537,0.26975 0.260449,0 0.492993,-0.0775 0.235645,-0.0775 0.434082,-0.22944 v 0.90847 q -0.260449,0.0961 -0.5302,0.14263 -0.26665,0.0496 -0.536401,0.0496 -0.939478,0 -1.469678,-0.48059 -0.5302,-0.48369 -0.5302,-1.34256 0,-0.85886 0.5302,-1.33945 0.5302,-0.48369 1.469678,-0.48369 0.272851,0 0.536401,0.0496 0.266651,0.0465 0.5302,0.14263 z m 2.17041,-1.09451 v 0.98599 h 1.144116 v 0.79375 h -1.144116 v 1.47277 q 0,0.24185 0.09612,0.32867 0.09612,0.0837 0.381372,0.0837 h 0.570508 v 0.79375 h -0.95188 q -0.657324,0 -0.933276,-0.27285 -0.272852,-0.27595 -0.272852,-0.93328 v -1.47277 h -0.551904 v -0.79375 h 0.551904 v -0.98599 z m 1.78594,3.10679 v -2.1208 h 1.116211 v 0.34726 q 0,0.28215 -0.0031,0.71004 -0.0031,0.42478 -0.0031,0.5674 0,0.41858 0.0217,0.60462 0.0217,0.18293 0.07441,0.26665 0.06821,0.10852 0.176734,0.16743 0.111621,0.0589 0.254248,0.0589 0.347265,0 0.545703,-0.26665 0.198437,-0.26665 0.198437,-0.74104 v -1.71462 h 1.11001 v 3.47265 h -1.11001 v -0.50229 q -0.251147,0.30385 -0.5333,0.44958 -0.279053,0.14263 -0.617017,0.14263 -0.601514,0 -0.917773,-0.36897 -0.31316,-0.36897 -0.31316,-1.0728 z m 7.137548,-1.17513 q -0.145728,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288355,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229443,0.27285 -0.229443,0.78445 v 1.5999 h -1.11001 v -3.47265 h 1.11001 v 0.5705 q 0.21394,-0.34106 0.489893,-0.49609 0.279052,-0.15813 0.666625,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189136,0.0186 z m 4.018359,0.78135 v 0.31626 h -2.59519 q 0.04031,0.39068 0.282153,0.58601 0.241846,0.19534 0.675928,0.19534 0.350366,0 0.716235,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393774,0.14883 -0.787549,0.22324 -0.393774,0.0775 -0.787549,0.0775 -0.942578,0 -1.466577,-0.47749 -0.520898,-0.48059 -0.520898,-1.34566 0,-0.84956 0.511596,-1.33635 0.514698,-0.48679 1.413868,-0.48679 0.818554,0 1.308447,0.49299 0.492993,0.493 0.492993,1.31775 z m -1.141016,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182934,-0.19534 -0.480591,-0.19534 -0.32246,0 -0.523999,0.18293 -0.201538,0.17984 -0.251147,0.5209 z"
-         id="path35" />
+         style="font-weight:bold;font-size:6.35px;line-height:1.25;font-family:Sans;-inkscape-font-specification:'Sans Bold';white-space:pre;fill:#999999;stroke-width:0.264583"
+         d="M 7.5868164,159.98909 H 8.780542 v 4.62917 H 7.5868164 Z m 5.8042966,2.51457 v 2.1146 h -1.116211 v -0.34416 -1.27434 q 0,-0.44959 -0.0217,-0.62012 -0.0186,-0.17053 -0.06821,-0.25115 -0.06511,-0.10852 -0.176733,-0.16743 -0.111621,-0.062 -0.254248,-0.062 -0.347266,0 -0.545703,0.26975 -0.198438,0.26665 -0.198438,0.74104 v 1.70842 H 9.8998534 v -3.47265 h 1.1100096 v 0.50849 q 0.251148,-0.30386 0.533301,-0.44648 0.282153,-0.14573 0.623218,-0.14573 0.601513,0 0.911572,0.36897 0.313159,0.36897 0.313159,1.0728 z m 3.314527,-2.70991 v 0.72864 h -0.613916 q -0.235645,0 -0.328663,0.0868 -0.09302,0.0837 -0.09302,0.29456 v 0.24185 h 0.948779 v 0.79375 h -0.948779 v 2.6789 h -1.11001 v -2.6789 H 14.00813 v -0.79375 h 0.551904 v -0.24185 q 0,-0.56741 0.31626,-0.83716 0.31626,-0.27285 0.979785,-0.27285 z m 3.057177,2.29753 q -0.145727,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288354,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229444,0.27285 -0.229444,0.78445 v 1.5999 H 17.18313 v -3.47265 h 1.110009 v 0.5705 q 0.213941,-0.34106 0.489893,-0.49609 0.279053,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189136,0.0186 z m 2.108399,0.96429 q -0.347266,0 -0.523999,0.11782 -0.173633,0.11782 -0.173633,0.34726 0,0.21084 0.139526,0.33177 0.142627,0.11782 0.393775,0.11782 0.313159,0 0.527099,-0.22324 0.213941,-0.22635 0.213941,-0.56431 v -0.12712 z m 1.69602,-0.41858 v 1.98127 h -1.119311 v -0.5147 q -0.223243,0.31626 -0.502295,0.46199 -0.279053,0.14263 -0.679029,0.14263 -0.539502,0 -0.877465,-0.31316 -0.334864,-0.31626 -0.334864,-0.81856 0,-0.61081 0.418579,-0.89606 0.42168,-0.28526 1.32085,-0.28526 h 0.654224 v -0.0868 q 0,-0.26355 -0.20774,-0.38448 -0.207739,-0.12402 -0.648022,-0.12402 -0.356568,0 -0.663526,0.0713 -0.306958,0.0713 -0.570507,0.21394 v -0.84646 q 0.356567,-0.0868 0.716235,-0.13022 0.359668,-0.0465 0.719336,-0.0465 0.939477,0 1.354956,0.37207 0.418579,0.36897 0.418579,1.20303 z m 3.745508,-1.38286 v 0.84336 q -0.356567,-0.14883 -0.68833,-0.22325 -0.331762,-0.0744 -0.626318,-0.0744 -0.31626,0 -0.471289,0.0806 -0.151929,0.0775 -0.151929,0.24185 0,0.13333 0.114722,0.20464 0.117822,0.0713 0.418579,0.10542 l 0.195337,0.0279 q 0.852661,0.10852 1.147217,0.35657 0.294555,0.24805 0.294555,0.77825 0,0.555 -0.409277,0.83406 -0.409277,0.27905 -1.221631,0.27905 -0.344165,0 -0.713135,-0.0558 -0.365869,-0.0527 -0.753442,-0.16123 v -0.84336 q 0.331763,0.16123 0.679028,0.24184 0.350367,0.0806 0.710035,0.0806 0.325561,0 0.489892,-0.0899 0.164331,-0.0899 0.164331,-0.26665 0,-0.14883 -0.114721,-0.22014 -0.111622,-0.0744 -0.449585,-0.11472 l -0.195337,-0.0248 q -0.74104,-0.093 -1.038697,-0.34416 -0.297656,-0.25115 -0.297656,-0.76275 0,-0.5519 0.378272,-0.81855 0.378271,-0.26665 1.159619,-0.26665 0.306958,0 0.644922,0.0465 0.337963,0.0465 0.734838,0.14573 z m 2.27893,-1.09451 v 0.98599 h 1.144117 v 0.79375 h -1.144117 v 1.47277 q 0,0.24185 0.09612,0.32867 0.09612,0.0837 0.381372,0.0837 h 0.570507 v 0.79375 h -0.951879 q -0.657325,0 -0.933277,-0.27285 -0.272851,-0.27595 -0.272851,-0.93328 v -1.47277 H 27.92976 v -0.79375 h 0.551905 v -0.98599 z m 4.402834,1.93166 q -0.145728,-0.0682 -0.291456,-0.0992 -0.142626,-0.0341 -0.288354,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229443,0.27285 -0.229443,0.78445 v 1.5999 h -1.11001 v -3.47265 h 1.11001 v 0.5705 q 0.21394,-0.34106 0.489892,-0.49609 0.279053,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189136,0.0186 z m 0.514697,1.17513 v -2.1208 h 1.116211 v 0.34726 q 0,0.28215 -0.0031,0.71004 -0.0031,0.42478 -0.0031,0.5674 0,0.41858 0.0217,0.60462 0.0217,0.18293 0.07441,0.26665 0.06821,0.10852 0.176733,0.16743 0.111621,0.0589 0.254248,0.0589 0.347266,0 0.545703,-0.26665 0.198438,-0.26665 0.198438,-0.74104 v -1.71462 h 1.11001 v 3.47265 h -1.11001 v -0.50229 q -0.251148,0.30385 -0.533301,0.44958 -0.279053,0.14263 -0.617017,0.14263 -0.601513,0 -0.917773,-0.36897 -0.313159,-0.36897 -0.313159,-1.0728 z m 7.36389,-2.01228 v 0.90537 q -0.226343,-0.15503 -0.455786,-0.22945 -0.226343,-0.0744 -0.471289,-0.0744 -0.465088,0 -0.725537,0.27285 -0.257349,0.26975 -0.257349,0.75654 0,0.4868 0.257349,0.75965 0.260449,0.26975 0.725537,0.26975 0.260449,0 0.492993,-0.0775 0.235644,-0.0775 0.434082,-0.22944 v 0.90847 q -0.260449,0.0961 -0.5302,0.14263 -0.266651,0.0496 -0.536402,0.0496 -0.939477,0 -1.469677,-0.48059 -0.530201,-0.48369 -0.530201,-1.34256 0,-0.85886 0.530201,-1.33945 0.5302,-0.48369 1.469677,-0.48369 0.272852,0 0.536402,0.0496 0.26665,0.0465 0.5302,0.14263 z m 2.170409,-1.09451 v 0.98599 h 1.144117 v 0.79375 h -1.144117 v 1.47277 q 0,0.24185 0.09612,0.32867 0.09612,0.0837 0.381373,0.0837 h 0.570507 v 0.79375 h -0.95188 q -0.657324,0 -0.933276,-0.27285 -0.272851,-0.27595 -0.272851,-0.93328 v -1.47277 H 42.38159 v -0.79375 h 0.551905 v -0.98599 z m 1.785941,3.10679 v -2.1208 h 1.116211 v 0.34726 q 0,0.28215 -0.0031,0.71004 -0.0031,0.42478 -0.0031,0.5674 0,0.41858 0.0217,0.60462 0.0217,0.18293 0.07441,0.26665 0.06821,0.10852 0.176733,0.16743 0.111621,0.0589 0.254248,0.0589 0.347266,0 0.545703,-0.26665 0.198438,-0.26665 0.198438,-0.74104 v -1.71462 h 1.11001 v 3.47265 h -1.11001 v -0.50229 q -0.251148,0.30385 -0.533301,0.44958 -0.279053,0.14263 -0.617017,0.14263 -0.601513,0 -0.917773,-0.36897 -0.313159,-0.36897 -0.313159,-1.0728 z m 7.137547,-1.17513 q -0.145727,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288354,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229444,0.27285 -0.229444,0.78445 v 1.5999 h -1.110009 v -3.47265 h 1.110009 v 0.5705 q 0.213941,-0.34106 0.489893,-0.49609 0.279053,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189136,0.0186 z m 4.01836,0.78135 v 0.31626 h -2.595191 q 0.04031,0.39068 0.282153,0.58601 0.241846,0.19534 0.675928,0.19534 0.350366,0 0.716235,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393774,0.14883 -0.787548,0.22324 -0.393775,0.0775 -0.787549,0.0775 -0.942578,0 -1.466577,-0.47749 -0.520899,-0.48059 -0.520899,-1.34566 0,-0.84956 0.511597,-1.33635 0.514697,-0.48679 1.413867,-0.48679 0.818555,0 1.308447,0.49299 0.492994,0.493 0.492994,1.31775 z m -1.141016,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182935,-0.19534 -0.480591,-0.19534 -0.322461,0 -0.523999,0.18293 -0.201538,0.17984 -0.251148,0.5209 z m -45.036011,5.56865 v 0.97979 q -0.381372,-0.17053 -0.74414,-0.25735 -0.362769,-0.0868 -0.68523,-0.0868 -0.4278808,0 -0.6325195,0.11783 -0.2046386,0.11782 -0.2046386,0.36587 0,0.18603 0.1364257,0.29145 0.1395264,0.10232 0.5022949,0.17673 l 0.5084961,0.10232 q 0.7720464,0.15503 1.0976074,0.47129 0.325562,0.31626 0.325562,0.89917 0,0.76585 -0.455787,1.14102 -0.452685,0.37207 -1.3859615,0.37207 -0.4402832,0 -0.8836669,-0.0837 Q 7.9433838,172.47825 7.5,172.31392 v -1.00769 q 0.4433838,0.23564 0.8557617,0.35656 0.4154785,0.11783 0.7999512,0.11783 0.3906738,0 0.598413,-0.13023 0.2077393,-0.13022 0.2077393,-0.37207 0,-0.21704 -0.142627,-0.33486 -0.1395263,-0.11783 -0.561206,-0.21084 L 8.7960449,170.6303 q -0.6945312,-0.14883 -1.0169922,-0.47439 -0.3193603,-0.32556 -0.3193603,-0.87747 0,-0.69143 0.4464843,-1.0635 0.4464844,-0.37207 1.2836426,-0.37207 0.3813721,0 0.7844482,0.0589 0.4030765,0.0558 0.8340575,0.17053 z m 4.768701,2.73782 v 0.31626 h -2.59519 q 0.04031,0.39068 0.282153,0.58601 0.241846,0.19534 0.675928,0.19534 0.350366,0 0.716235,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393774,0.14883 -0.787549,0.22324 -0.393774,0.0775 -0.787548,0.0775 -0.942578,0 -1.466578,-0.47749 -0.520898,-0.48059 -0.520898,-1.34566 0,-0.84956 0.511597,-1.33635 0.514697,-0.48679 1.413867,-0.48679 0.818555,0 1.308447,0.49299 0.492993,0.493 0.492993,1.31775 z m -1.141015,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182935,-0.19534 -0.480591,-0.19534 -0.322461,0 -0.523999,0.18293 -0.201538,0.17984 -0.251148,0.5209 z m 4.560961,-0.41238 q -0.145728,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288355,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229443,0.27285 -0.229443,0.78445 v 1.5999 h -1.11001 v -3.47265 h 1.11001 v 0.5705 q 0.213941,-0.34106 0.489893,-0.49609 0.279052,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189135,0.0186 z m 0.114722,-0.94567 h 1.110009 l 0.865064,2.39985 0.861963,-2.39985 h 1.11311 l -1.367358,3.47265 h -1.218531 z m 4.576464,0 h 1.11001 v 3.47265 h -1.11001 z m 0,-1.35186 h 1.11001 v 0.90537 h -1.11001 z m 4.982642,1.46038 v 0.90537 q -0.226343,-0.15503 -0.455787,-0.22945 -0.226342,-0.0744 -0.471289,-0.0744 -0.465087,0 -0.725537,0.27285 -0.257348,0.26975 -0.257348,0.75654 0,0.4868 0.257348,0.75965 0.26045,0.26975 0.725537,0.26975 0.26045,0 0.492994,-0.0775 0.235644,-0.0775 0.434082,-0.22944 v 0.90847 q -0.26045,0.0961 -0.530201,0.14263 -0.26665,0.0496 -0.536401,0.0496 -0.939477,0 -1.469678,-0.48059 -0.5302,-0.48369 -0.5302,-1.34256 0,-0.85886 0.5302,-1.33945 0.530201,-0.48369 1.469678,-0.48369 0.272852,0 0.536401,0.0496 0.266651,0.0465 0.530201,0.14263 z m 4.424537,1.6185 v 0.31626 h -2.595191 q 0.04031,0.39068 0.282154,0.58601 0.241845,0.19534 0.675928,0.19534 0.350366,0 0.716235,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393775,0.14883 -0.787549,0.22324 -0.393774,0.0775 -0.787549,0.0775 -0.942578,0 -1.466577,-0.47749 -0.520898,-0.48059 -0.520898,-1.34566 0,-0.84956 0.511596,-1.33635 0.514698,-0.48679 1.413867,-0.48679 0.818555,0 1.308448,0.49299 0.492993,0.493 0.492993,1.31775 z m -1.141016,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182934,-0.19534 -0.480591,-0.19534 -0.322461,0 -0.523999,0.18293 -0.201538,0.17984 -0.251147,0.5209 z"
+         id="text1"
+         inkscape:label="infrastructureservice.label"
+         transform="translate(4.9959484,2.3022609)"
+         aria-label="Infrastructure&#10;Service" />
       <path
-         style="font-weight:bold;font-family:Sans;-inkscape-font-specification:'Sans Bold'"
-         d="m 15.9314,170.5429 v 0.97979 q -0.381372,-0.17053 -0.744141,-0.25735 -0.362768,-0.0868 -0.685229,-0.0868 -0.427881,0 -0.63252,0.11783 -0.204639,0.11782 -0.204639,0.36587 0,0.18603 0.136426,0.29145 0.139527,0.10232 0.502295,0.17673 l 0.508496,0.10232 q 0.772046,0.15503 1.097608,0.47129 0.325561,0.31626 0.325561,0.89917 0,0.76585 -0.455786,1.14102 -0.452686,0.37207 -1.385962,0.37207 -0.440283,0 -0.883667,-0.0837 -0.443384,-0.0837 -0.886767,-0.24804 v -1.00769 q 0.443383,0.23564 0.855761,0.35656 0.415479,0.11783 0.799951,0.11783 0.390674,0 0.598413,-0.13023 0.20774,-0.13022 0.20774,-0.37207 0,-0.21704 -0.142627,-0.33486 -0.139527,-0.11783 -0.561206,-0.21084 l -0.461988,-0.10232 q -0.694531,-0.14883 -1.016992,-0.47439 -0.31936,-0.32556 -0.31936,-0.87747 0,-0.69143 0.446484,-1.0635 0.446485,-0.37207 1.283643,-0.37207 0.381372,0 0.784448,0.0589 0.403076,0.0558 0.834058,0.17053 z m 4.768701,2.73782 v 0.31626 H 18.10491 q 0.04031,0.39068 0.282154,0.58601 0.241845,0.19534 0.675927,0.19534 0.350367,0 0.716236,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393775,0.14883 -0.787549,0.22324 -0.393774,0.0775 -0.787549,0.0775 -0.942578,0 -1.466577,-0.47749 -0.520898,-0.48059 -0.520898,-1.34566 0,-0.84956 0.511596,-1.33635 0.514698,-0.48679 1.413867,-0.48679 0.818555,0 1.308448,0.49299 0.492993,0.493 0.492993,1.31775 z m -1.141016,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182934,-0.19534 -0.480591,-0.19534 -0.322461,0 -0.523999,0.18293 -0.201538,0.17984 -0.251147,0.5209 z m 4.560961,-0.41238 q -0.145727,-0.0682 -0.291455,-0.0992 -0.142627,-0.0341 -0.288354,-0.0341 -0.427881,0 -0.660425,0.27595 -0.229443,0.27285 -0.229443,0.78445 v 1.5999 h -1.11001 v -3.47265 h 1.11001 v 0.5705 q 0.21394,-0.34106 0.489892,-0.49609 0.279053,-0.15813 0.666626,-0.15813 0.05581,0 0.120923,0.006 0.06511,0.003 0.189136,0.0186 z m 0.114722,-0.94567 h 1.11001 l 0.865063,2.39985 0.861963,-2.39985 h 1.113111 l -1.367359,3.47265 h -1.21853 z m 4.576465,0 h 1.11001 v 3.47265 h -1.11001 z m 0,-1.35186 h 1.11001 v 0.90537 h -1.11001 z m 4.982641,1.46038 v 0.90537 q -0.226343,-0.15503 -0.455786,-0.22945 -0.226343,-0.0744 -0.471289,-0.0744 -0.465088,0 -0.725537,0.27285 -0.257349,0.26975 -0.257349,0.75654 0,0.4868 0.257349,0.75965 0.260449,0.26975 0.725537,0.26975 0.260449,0 0.492993,-0.0775 0.235645,-0.0775 0.434082,-0.22944 v 0.90847 q -0.260449,0.0961 -0.5302,0.14263 -0.26665,0.0496 -0.536401,0.0496 -0.939478,0 -1.469678,-0.48059 -0.5302,-0.48369 -0.5302,-1.34256 0,-0.85886 0.5302,-1.33945 0.5302,-0.48369 1.469678,-0.48369 0.272851,0 0.536401,0.0496 0.26665,0.0465 0.5302,0.14263 z m 4.424537,1.6185 v 0.31626 h -2.59519 q 0.04031,0.39068 0.282153,0.58601 0.241846,0.19534 0.675928,0.19534 0.350366,0 0.716235,-0.10232 0.36897,-0.10542 0.756543,-0.31626 v 0.85576 q -0.393774,0.14883 -0.787548,0.22324 -0.393775,0.0775 -0.787549,0.0775 -0.942578,0 -1.466577,-0.47749 -0.520899,-0.48059 -0.520899,-1.34566 0,-0.84956 0.511597,-1.33635 0.514697,-0.48679 1.413867,-0.48679 0.818555,0 1.308447,0.49299 0.492993,0.493 0.492993,1.31775 z m -1.141015,-0.36897 q 0,-0.31626 -0.186035,-0.50849 -0.182935,-0.19534 -0.480591,-0.19534 -0.322461,0 -0.523999,0.18293 -0.201538,0.17984 -0.251148,0.5209 z"
-         id="path36" />
-    </g>
+         id="rect1"
+         style="display:inline;fill:none;stroke:#8c8c8c;stroke-width:2"
+         inkscape:label="infrastructureservice.form"
+         d="M 7.004765,159 H 325.00477 v 20.00001 H 7.004765 Z" />
+    </a>
   </g>
   <style
      type="text/css"
diff --git a/docs/ecosystem/architecture/media/onap-architecture-overview-interactive.svg b/docs/ecosystem/architecture/media/onap-architecture-overview-interactive.svg
index 82cc7e8..cd081bc 100644
--- a/docs/ecosystem/architecture/media/onap-architecture-overview-interactive.svg
+++ b/docs/ecosystem/architecture/media/onap-architecture-overview-interactive.svg
@@ -31,14 +31,14 @@
      inkscape:document-units="mm"
      showgrid="true"
      inkscape:zoom="1.4142136"
-     inkscape:cx="888.12609"
-     inkscape:cy="533.86561"
+     inkscape:cx="665.38746"
+     inkscape:cy="321.02647"
      inkscape:window-width="3768"
      inkscape:window-height="2096"
      inkscape:window-x="72"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="g15324"
+     inkscape:current-layer="g6143"
      height="190mm"
      showborder="true"
      inkscape:showpageshadow="true"
@@ -102,11 +102,11 @@
       <g
          id="g4786"
          inkscape:label="unmaintained"
-         transform="translate(139.99106,0.06481615)">
+         transform="translate(136.9979,0.04521811)">
         <rect
            style="font-variation-settings:normal;display:inline;fill:#bebebe;fill-opacity:1;stroke:#bebebe;stroke-width:1.98629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
            id="rect47709-1-8-8-2"
-           width="50.014"
+           width="53.01371"
            height="4.0137157"
            x="135"
            y="235"
@@ -120,19 +120,19 @@
            inkscape:label="unmaintained.label"><tspan
              x="135"
              y="237.80913"
-             id="tspan17"><tspan
+             id="tspan3"><tspan
                dx="0 0 0 0 0 0 0 0 0 0 0 0 0.2645835 -0.26458272 0 0 0 0.2645835 -0.26458463"
-               id="tspan16">Unmaintained ONAP Component</tspan></tspan></text>
+               id="tspan2">Unmaintained ONAP Component</tspan></tspan></text>
       </g>
       <g
          id="g4786-5"
          inkscape:label="onapcomponents"
-         transform="translate(87.991058,0.05109846)"
+         transform="translate(83.997896,0.04521811)"
          style="display:inline">
         <rect
            style="font-variation-settings:normal;display:inline;fill:#007da5;fill-opacity:1;stroke:#007da5;stroke-width:1.98629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
            id="rect47709-1-8-8-2-35"
-           width="50.01371"
+           width="51.01371"
            height="4.0137157"
            x="135"
            y="235"
@@ -146,22 +146,23 @@
            inkscape:label="onapcomponents.label"><tspan
              x="135"
              y="237.80913"
-             id="tspan19"><tspan
+             id="tspan5"><tspan
                dx="0 0 0 0 0 0 0 0 0.26458338 -0.26458272 0 0.2645829 -0.26458272 0 0 0 0.2645835 -0.26458272"
-               id="tspan18">Entirety of ONAP Components</tspan></tspan></text>
+               id="tspan4">Entirety of ONAP Components</tspan></tspan></text>
       </g>
       <g
          id="g4770"
          inkscape:label="operations"
-         transform="translate(-107.99524,0.06481615)">
+         transform="translate(-112.99525,0.05207315)">
         <rect
            style="display:inline;fill:#5695be;fill-opacity:1;stroke:#5695be;stroke-width:2.00285;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="rect47709-0-3-6-6-6"
-           width="49.99715"
+           width="50.99715"
            height="3.9971504"
            x="279"
-           y="235"
-           inkscape:label="operation.form" />
+           y="235.08536"
+           inkscape:label="operation.form"
+           transform="skewY(-0.01605976)" />
         <text
            xml:space="preserve"
            style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect47709-0-3-6-6-6);display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
@@ -171,20 +172,20 @@
            inkscape:label="operations.label"
            transform="matrix(1.00026,0,0,1,-0.0728097,0)"><tspan
              x="279"
-             y="237.80913"
-             id="tspan20">Operations</tspan></text>
+             y="237.80327"
+             id="tspan6">Operations</tspan></text>
       </g>
       <g
          id="g4776"
          inkscape:label="orchestrationmanagement"
-         transform="translate(-111.99809,0.06481615)">
+         transform="translate(-117.9981,0.05207315)">
         <rect
            style="display:inline;fill:#009893;fill-opacity:1;stroke:#009893;stroke-width:2.00285;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="rect47709-0-3-6-6"
-           width="49.99715"
+           width="50.99715"
            height="3.9971504"
-           x="231.00285"
-           y="235"
+           x="231.00429"
+           y="235.00142"
            inkscape:label="orchestrationmanagement.form" />
         <text
            xml:space="preserve"
@@ -194,20 +195,20 @@
            id="text1436-0-1"
            inkscape:label="orchestrationmanagement.label"
            transform="matrix(1.00026,0,0,1,-0.0602911,0)"><tspan
-             x="231.00195"
-             y="237.80913"
-             id="tspan22"><tspan
+             x="231.00391"
+             y="237.81108"
+             id="tspan8"><tspan
                dx="0 0 0 0 0 0 0 0 0 0 0 0 0 0.26458278 -0.26458272 0.26458231 -0.26458272"
-               id="tspan21">Orchestration &amp; Management</tspan></tspan></text>
+               id="tspan7">Orchestration &amp; Management</tspan></tspan></text>
       </g>
       <g
          id="g4765"
          inkscape:label="design"
-         transform="translate(-115.99524,0.06481615)">
+         transform="translate(-122.99524,0.05207315)">
         <rect
            style="display:inline;fill:#1a3d6f;fill-opacity:1;stroke:#1a3d6f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="rect47709-0-9-8-2"
-           width="50"
+           width="50.999996"
            height="4.0000005"
            x="183"
            y="235"
@@ -221,33 +222,34 @@
            inkscape:label="design.label"><tspan
              x="183"
              y="237.80913"
-             id="tspan23">Design</tspan></text>
+             id="tspan9">Design</tspan></text>
       </g>
       <g
          id="g4781"
          inkscape:label="3rdparty"
-         style="display:inline">
+         style="display:inline;stroke-width:0.99989"
+         transform="matrix(1.0002198,0,0,1,-0.00153984,0)">
         <rect
-           style="font-variation-settings:normal;display:inline;fill:#8c8c8c;fill-opacity:1;stroke:#8c8c8c;stroke-width:1.98725;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+           style="font-variation-settings:normal;display:inline;fill:#8c8c8c;fill-opacity:1;stroke:#8c8c8c;stroke-width:1.98703;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
            id="rect47709-1-8-8-2-3"
-           width="58"
+           width="51.001324"
            height="4.0127535"
-           x="7.0047631"
+           x="7.0047607"
            y="235.05206"
            inkscape:label="3rdparty.form" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect47709-1-8-8-2-3);display:inline;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect47709-1-8-8-2-3);display:inline;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.264554"
            x="219.84161"
            y="-1.435748"
            id="text1436-447-9-3-5"
            inkscape:label="3rdparty.label"><tspan
              x="7.0039062"
              y="237.86187"
-             id="tspan25"><tspan
+             id="tspan11"><tspan
                dx="0 0 0 0.26458326 -0.2645832"
                style="fill:#f9f9f9"
-               id="tspan24">3rd Party</tspan></tspan></text>
+               id="tspan10">3rd Party</tspan></tspan></text>
       </g>
     </g>
     <g
@@ -273,16 +275,16 @@
          transform="translate(-0.00405397,-0.18939306)"><tspan
            x="12.003906"
            y="165.62021"
-           id="tspan27"><tspan
+           id="tspan13"><tspan
              dx="0 0 0 0 0 0 0 0.26458254"
              style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-             id="tspan26">Managed
+             id="tspan12">Managed
 </tspan></tspan><tspan
            x="12.003906"
            y="173.55771"
-           id="tspan29"><tspan
+           id="tspan15"><tspan
              style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-             id="tspan28">Environment</tspan></tspan></text>
+             id="tspan14">Environment</tspan></tspan></text>
       <rect
          style="display:inline;fill:none;fill-opacity:1;stroke:#f6d27c;stroke-width:2.01531;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000"
          id="rect55176-2"
@@ -448,10 +450,10 @@
                inkscape:label="hypervisoroslayer.label"><tspan
                  x="86.003906"
                  y="197.80913"
-                 id="tspan31"><tspan
+                 id="tspan17"><tspan
                    dx="0 0 0 0 0 0 0 0 0 0 0.2645835 -0.2645838 0.26458278 -0.26458189 0 0.2645835 -0.2645838"
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan30">Hypervisor / OS Layer</tspan></tspan></text>
+                   id="tspan16">Hypervisor / OS Layer</tspan></tspan></text>
           </g>
           <g
              id="g4413"
@@ -473,7 +475,7 @@
                inkscape:label="openstack.label"><tspan
                  x="135.00391"
                  y="198.49163"
-                 id="tspan32">OpenStack</tspan></text>
+                 id="tspan18">OpenStack</tspan></text>
           </g>
           <g
              id="g4408"
@@ -495,9 +497,9 @@
                inkscape:label="commercialvim.label"><tspan
                  x="167.00391"
                  y="198.49163"
-                 id="tspan34"><tspan
+                 id="tspan20"><tspan
                    dx="0 0 0 0 0 0 0 0 0 0 0.26458123 -0.26458272"
-                   id="tspan33">Commercial VIM</tspan></tspan></text>
+                   id="tspan19">Commercial VIM</tspan></tspan></text>
           </g>
           <g
              id="g4396"
@@ -519,7 +521,7 @@
                inkscape:label="kubernetes.label"><tspan
                  x="199.00391"
                  y="198.49163"
-                 id="tspan35">Kubernetes</tspan></text>
+                 id="tspan21">Kubernetes</tspan></text>
           </g>
           <g
              id="g4402"
@@ -541,9 +543,9 @@
                inkscape:label="publiccloud.label"><tspan
                  x="231.00391"
                  y="198.49163"
-                 id="tspan37"><tspan
+                 id="tspan23"><tspan
                    dx="0 0 0 0 0 0 0.2645829 -0.26458272"
-                   id="tspan36">Public Cloud</tspan></tspan></text>
+                   id="tspan22">Public Cloud</tspan></tspan></text>
           </g>
         </g>
         <g
@@ -571,10 +573,10 @@
                inkscape:label="networkfunktionlayer.label"><tspan
                  x="86.003906"
                  y="185.80913"
-                 id="tspan39"><tspan
+                 id="tspan25"><tspan
                    dx="0 0 0 0 0 0 0 0.26458326 -0.26458284 0 0 0 0 0 0 0 0.26458278 -0.2645838"
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan38">Network Function Layer</tspan></tspan></text>
+                   id="tspan24">Network Function Layer</tspan></tspan></text>
           </g>
           <g
              id="g2995"
@@ -605,7 +607,7 @@
                transform="translate(-0.26458332,0.26458332)"><tspan
                  x="265.25391"
                  y="188.74163"
-                 id="tspan40">PNF</tspan></text>
+                 id="tspan26">PNF</tspan></text>
           </g>
           <g
              id="g2907"
@@ -627,7 +629,7 @@
                inkscape:label="vnf.label"><tspan
                  x="199.00391"
                  y="186.49163"
-                 id="tspan41">VNF</tspan></text>
+                 id="tspan27">VNF</tspan></text>
           </g>
         </g>
         <g
@@ -656,10 +658,10 @@
                inkscape:label="externalsystems.label"><tspan
                  x="86.003906"
                  y="173.80913"
-                 id="tspan43"><tspan
+                 id="tspan29"><tspan
                    dx="0 0 0 0 0 0 0 0 0.26458243 -0.26458284"
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan42">External Systems</tspan></tspan></text>
+                   id="tspan28">External Systems</tspan></tspan></text>
           </g>
           <g
              id="g4437"
@@ -681,9 +683,9 @@
                inkscape:label="thirdpartycontrollers.label"><tspan
                  x="135.00391"
                  y="174.49163"
-                 id="tspan45"><tspan
+                 id="tspan31"><tspan
                    dx="0 0 0 0.26458326 -0.2645832 0 0 0 0 0.26458338 -0.26458368"
-                   id="tspan44">3rd Party Controllers</tspan></tspan></text>
+                   id="tspan30">3rd Party Controllers</tspan></tspan></text>
           </g>
           <g
              id="g4442"
@@ -705,7 +707,7 @@
                inkscape:label="svnfm.label"><tspan
                  x="199.00391"
                  y="174.49163"
-                 id="tspan46">sVNFM</tspan></text>
+                 id="tspan32">sVNFM</tspan></text>
           </g>
           <g
              id="g4447"
@@ -727,69 +729,37 @@
                inkscape:label="ems.label"><tspan
                  x="231.00391"
                  y="174.49163"
-                 id="tspan47">EMS</tspan></text>
+                 id="tspan33">EMS</tspan></text>
           </g>
         </g>
       </g>
     </g>
-    <g
-       id="g1"
-       inkscape:label="infrastructureservice"
-       style="display:inline">
-      <a
-         id="a6"
-         xlink:title="To be done"
-         inkscape:label="servicemesh.link"
-         onmouseover="style.opacity = 0.6;"
-         onmouseout="style.opacity = 1.0;"
-         style="display:inline">
-        <g
-           id="g7029-1"
-           inkscape:label="servicemesh"
-           style="display:inline"
-           transform="translate(-0.02480324,58.751175)">
-          <rect
-             style="font-variation-settings:normal;vector-effect:none;fill:#8c8c8c;fill-opacity:1;stroke:#8c8c8c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
-             id="rect13557-2-5-3-2"
-             width="175.97501"
-             height="12"
-             x="81.029564"
-             y="104.24883"
-             inkscape:label="servicemesh.form" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.05;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect13557-2-5-3-2);display:inline;fill:#fffffb;fill-opacity:1;stroke:none;stroke-width:0.264583"
-             x="174.68517"
-             y="13.522552"
-             id="text1436-447-86-9-9"
-             inkscape:label="servicemesh.label"><tspan
-               x="81.029297"
-               y="106.73968"
-               id="tspan49"><tspan
-                 dx="0 0 0 0 0 0 0 0.26458254 -0.26458272"
-                 id="tspan48">Service Mesh</tspan></tspan></text>
-        </g>
-      </a>
-      <a
-         id="a7"
-         xlink:title="To be done"
-         xlink:href="infrastructure%20service%20link"
-         inkscape:label="infrastructureservice.link"
+    <a
+       id="a6"
+       xlink:title="Service Mesh: To be done"
+       inkscape:label="servicemesh.link"
+       onmouseover="style.opacity = 0.6;"
+       onmouseout="style.opacity = 1.0;"
+       style="display:inline"
+       xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html">
+      <g
+         id="g7029-1"
+         inkscape:label="servicemesh"
          style="display:inline"
-         onmouseover="style.opacity = 0.6;"
-         onmouseout="style.opacity = 1.0;">
-        <rect
-           style="display:inline;fill:none;fill-opacity:1;stroke:#8c8c8c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000000"
-           id="rect55176-2-4"
-           width="318"
-           height="19.999998"
-           x="7.0047593"
-           y="120"
-           inkscape:label="infrastructureservice.form"
-           ry="0"
-           transform="translate(-4e-7,39.000008)" />
-      </a>
-    </g>
+         transform="translate(-0.02480324,58.751175)">
+        <path
+           id="rect13557-2-5-3-2"
+           style="vector-effect:none;fill:#8c8c8c;stroke:#8c8c8c;stroke-width:2;stop-color:#000000"
+           inkscape:label="servicemesh.form"
+           d="M 81.029564,104.24883 H 257.00457 v 12 H 81.029564 Z" />
+        <path
+           d="m 82.728418,104.50105 v 0.30541 q -0.178284,-0.0853 -0.336414,-0.12712 -0.15813,-0.0419 -0.305407,-0.0419 -0.255799,0 -0.395325,0.0992 -0.137976,0.0992 -0.137976,0.28215 0,0.15348 0.09147,0.23255 0.09302,0.0775 0.350366,0.12557 l 0.189136,0.0388 q 0.350366,0.0667 0.516248,0.23564 0.167431,0.16743 0.167431,0.44959 0,0.33641 -0.226342,0.51004 -0.224793,0.17364 -0.660425,0.17364 -0.164331,0 -0.350366,-0.0372 -0.184485,-0.0372 -0.382923,-0.11007 v -0.32246 q 0.190686,0.10697 0.373621,0.16123 0.182934,0.0543 0.359668,0.0543 0.2682,0 0.413928,-0.10542 0.145727,-0.10542 0.145727,-0.30076 0,-0.17053 -0.105419,-0.26665 -0.10387,-0.0961 -0.342615,-0.14418 l -0.190686,-0.0372 q -0.350366,-0.0698 -0.506946,-0.21859 -0.15658,-0.14883 -0.15658,-0.41393 0,-0.30696 0.215491,-0.48369 0.217041,-0.17674 0.596863,-0.17674 0.162781,0 0.331763,0.0295 0.168982,0.0294 0.345715,0.0884 z m 2.008043,1.29915 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176733,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.161231,0.0341 -0.327112,0.0341 -0.415479,0 -0.658875,-0.24185 -0.241845,-0.24185 -0.241845,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.666978,-0.4465 q -0.04806,-0.0279 -0.10542,-0.0403 -0.05581,-0.014 -0.124023,-0.014 -0.241846,0 -0.37207,0.15813 -0.128675,0.15658 -0.128675,0.45113 v 0.91468 h -0.286804 v -1.73633 h 0.286804 v 0.26975 q 0.08992,-0.15813 0.234094,-0.23409 0.144178,-0.0775 0.350367,-0.0775 0.02945,0 0.06511,0.005 0.03566,0.003 0.07906,0.0109 z m 0.002,-0.26665 h 0.302307 l 0.542602,1.45727 0.542603,-1.45727 h 0.302307 l -0.651123,1.73633 h -0.387573 z m 1.990989,0 h 0.285254 v 1.73633 h -0.285254 z m 0,-0.67593 h 0.285254 v 0.36122 h -0.285254 z m 2.039049,0.74259 v 0.26665 q -0.120923,-0.0667 -0.243396,-0.0992 -0.120923,-0.0341 -0.244946,-0.0341 -0.277503,0 -0.430982,0.17673 -0.153479,0.17518 -0.153479,0.49299 0,0.31781 0.153479,0.49455 0.153479,0.17518 0.430982,0.17518 0.124023,0 0.244946,-0.0326 0.122473,-0.0341 0.243396,-0.10076 v 0.26355 q -0.119373,0.0558 -0.248047,0.0837 -0.127124,0.0279 -0.271301,0.0279 -0.392224,0 -0.623218,-0.2465 -0.230994,-0.2465 -0.230994,-0.66508 0,-0.42478 0.232544,-0.66817 0.234095,-0.2434 0.640271,-0.2434 0.131775,0 0.257349,0.0279 0.125574,0.0263 0.243396,0.0806 z m 1.88867,0.73019 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443383,0.15348 0.164331,0 0.31781,-0.0403 0.15503,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.314709,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553454,0.22634 0.204639,0.2248 0.204639,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337964,-0.13952 -0.238745,0 -0.382922,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.325294,-1.29139 h 0.466638 l 0.590662,1.5751 0.593762,-1.5751 h 0.466638 v 2.31459 H 94.89119 v -2.03244 l -0.596863,1.5875 h -0.31471 l -0.596862,-1.5875 v 2.03244 h -0.303858 z m 4.119542,1.37511 v 0.13953 h -1.311548 q 0.0186,0.29455 0.176734,0.44958 0.15968,0.15348 0.443384,0.15348 0.164331,0 0.31781,-0.0403 0.155029,-0.0403 0.306958,-0.12092 v 0.26975 q -0.153479,0.0651 -0.31471,0.0992 -0.16123,0.0341 -0.327112,0.0341 -0.415478,0 -0.658874,-0.24185 -0.241846,-0.24185 -0.241846,-0.65422 0,-0.42633 0.229443,-0.67593 0.230994,-0.25115 0.621668,-0.25115 0.350366,0 0.553455,0.22634 0.204638,0.2248 0.204638,0.61237 z m -0.285254,-0.0837 q -0.0031,-0.23409 -0.131775,-0.37362 -0.127124,-0.13952 -0.337963,-0.13952 -0.238746,0 -0.382923,0.13487 -0.142627,0.13488 -0.164331,0.37982 z m 1.767747,-0.66197 v 0.26975 q -0.120923,-0.062 -0.251147,-0.093 -0.130225,-0.031 -0.269751,-0.031 -0.21239,0 -0.319361,0.0651 -0.105419,0.0651 -0.105419,0.19534 0,0.0992 0.07596,0.15658 0.07596,0.0558 0.305408,0.10697 l 0.09767,0.0217 q 0.303857,0.0651 0.430981,0.18448 0.128675,0.11783 0.128675,0.33022 0,0.24184 -0.192237,0.38292 -0.190686,0.14108 -0.525549,0.14108 -0.139526,0 -0.291455,-0.0279 -0.150378,-0.0264 -0.31781,-0.0806 v -0.29456 q 0.15813,0.0822 0.311609,0.12402 0.153479,0.0403 0.303857,0.0403 0.201538,0 0.310059,-0.0682 0.10852,-0.0698 0.10852,-0.19534 0,-0.11627 -0.07906,-0.17828 -0.07751,-0.062 -0.342614,-0.11938 l -0.09922,-0.0233 q -0.2651,-0.0558 -0.382922,-0.17053 -0.117823,-0.11627 -0.117823,-0.31781 0,-0.24495 0.173633,-0.37827 0.173633,-0.13333 0.492993,-0.13333 0.15813,0 0.297657,0.0233 0.139526,0.0232 0.257348,0.0698 z m 1.897972,0.63717 v 1.048 h -0.28525 v -1.0387 q 0,-0.2465 -0.0961,-0.36897 -0.0961,-0.12247 -0.288357,-0.12247 -0.230994,0 -0.364319,0.14728 -0.133325,0.14727 -0.133325,0.40152 v 0.98134 h -0.286804 v -2.41226 h 0.286804 v 0.94568 q 0.102319,-0.15658 0.240295,-0.23409 0.139527,-0.0775 0.320911,-0.0775 0.299215,0 0.452685,0.18604 0.15348,0.18448 0.15348,0.54415 z"
+           id="text1436-447-86-9-9"
+           style="font-size:3.175px;line-height:1.05;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;fill:#fffffb;stroke-width:0.264583"
+           inkscape:label="servicemesh.label"
+           aria-label="Service Mesh" />
+      </g>
+    </a>
     <a
        id="a5443"
        inkscape:label="onapborder.link"
@@ -839,10 +809,10 @@
              inkscape:label="manageonap.label"><tspan
                x="172"
                y="57.551855"
-               id="tspan51"><tspan
+               id="tspan35"><tspan
                  dx="0 0 0 0 0 0 0.26458302 -0.2645826"
                  style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                 id="tspan50">Manage ONAP</tspan></tspan></text>
+                 id="tspan34">Manage ONAP</tspan></tspan></text>
         </g>
       </a>
       <a
@@ -873,9 +843,9 @@
              inkscape:label="oom.label"><tspan
                x="267.00391"
                y="55.742725"
-               id="tspan53"><tspan
+               id="tspan37"><tspan
                  dx="0 0 0 0 0.26458302 -0.26458272 0 0 0 0 0 0 0 0 0.26458278 -0.26458272 0 0 0 0 0 0 0.26458243 -0.26458272"
-                 id="tspan52">ONAP Operation Manager (OOM)</tspan></tspan></text>
+                 id="tspan36">ONAP Operation Manager (OOM)</tspan></tspan></text>
         </g>
       </a>
     </g>
@@ -912,9 +882,9 @@
              transform="translate(-1.433475e-4)"><tspan
                x="12"
                y="57.551855"
-               id="tspan55"><tspan
+               id="tspan39"><tspan
                  style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold';opacity:1"
-                 id="tspan54">Design-Time</tspan></tspan></text>
+                 id="tspan38">Design-Time</tspan></tspan></text>
           <text
              xml:space="preserve"
              transform="matrix(0.26458333,0,0,0.26458333,3.9999998,3.9999989)"
@@ -955,16 +925,16 @@
                inkscape:label="sdc.label"><tspan
                  x="16"
                  y="92.742725"
-                 id="tspan57"><tspan
+                 id="tspan41"><tspan
                    dx="0 0 0 0 0 0 0 0.26458231 -0.26458284 0 0 0 0 0 0.26458278 -0.2645838 0.26458398 -0.2645838 0 0 0 0 0 0 0 0.26458088"
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan56">Service Design &amp; Creation
+                   id="tspan40">Service Design &amp; Creation
 </tspan></tspan><tspan
                  x="16"
                  y="96.711475"
-                 id="tspan59"><tspan
+                 id="tspan43"><tspan
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan58">(SDC)</tspan></tspan></text>
+                   id="tspan42">(SDC)</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -996,7 +966,7 @@
                inkscape:label="catalog.label"><tspan
                  x="17.255859"
                  y="143.74272"
-                 id="tspan60">Catalog</tspan></text>
+                 id="tspan44">Catalog</tspan></text>
           </g>
         </a>
         <a
@@ -1027,9 +997,9 @@
                inkscape:label="workflowdesigner.label"><tspan
                  x="17"
                  y="119.74272"
-                 id="tspan62"><tspan
+                 id="tspan46"><tspan
                    dx="0 0 0 0 0 0.092604198 -0.0926046 0 0.2645835 -0.26458272"
-                   id="tspan61">Workflow Designer</tspan></tspan></text>
+                   id="tspan45">Workflow Designer</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1060,9 +1030,9 @@
                inkscape:label="xnfonboarding.label"><tspan
                  x="17"
                  y="111.74272"
-                 id="tspan64"><tspan
+                 id="tspan48"><tspan
                    dx="0 0 0 0.26458278 -0.2645832"
-                   id="tspan63">xNF Onboarding</tspan></tspan></text>
+                   id="tspan47">xNF Onboarding</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1096,9 +1066,9 @@
                sodipodi:insensitive="true"><tspan
                  x="17"
                  y="103.74272"
-                 id="tspan66"><tspan
+                 id="tspan50"><tspan
                    dx="0 0 0 0 0 0 0 0 0 0 0 0.26458278 -0.26458272"
-                   id="tspan65">Service/xNF Design</tspan></tspan></text>
+                   id="tspan49">Service/xNF Design</tspan></tspan></text>
           </g>
         </a>
       </g>
@@ -1133,9 +1103,9 @@
              inkscape:label="runtime.label"><tspan
                x="78"
                y="57.551855"
-               id="tspan68"><tspan
+               id="tspan52"><tspan
                  style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold';opacity:1"
-                 id="tspan67">Run-Time</tspan></tspan></text>
+                 id="tspan51">Run-Time</tspan></tspan></text>
         </g>
       </a>
       <g
@@ -1171,10 +1141,10 @@
                inkscape:label="sharedservices.label"><tspan
                  x="268"
                  y="92.742725"
-                 id="tspan70"><tspan
+                 id="tspan54"><tspan
                    dx="0 0 0 0 0 0 0.26458302 -0.2645838"
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold'"
-                   id="tspan69">Shared Services</tspan></tspan></text>
+                   id="tspan53">Shared Services</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1183,13 +1153,13 @@
            onmouseover="style.opacity = 0.6;"
            onmouseout="style.opacity = 1.0;"
            xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html#shared-services"
-           xlink:title="To be done"
+           xlink:title="Security Framework: To be done"
            transform="translate(-2.1000011e-7,18)"
            style="display:inline">
           <g
              id="g1912-5"
              inkscape:label="security-framework"
-             transform="translate(0,-10)">
+             transform="translate(-1.422182e-5,6.0000053)">
             <rect
                style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#66c1be;fill-opacity:1;stroke:#66c1be;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
                id="rect47709-1-2-6"
@@ -1207,9 +1177,9 @@
                inkscape:label="security-framework.label"><tspan
                  x="269"
                  y="111.74272"
-                 id="tspan72"><tspan
+                 id="tspan56"><tspan
                    dx="0 0 0 0 0 0 0 0 0.26458243 -0.26458272"
-                   id="tspan71">Security Framework</tspan></tspan></text>
+                   id="tspan55">Security Framework</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1217,9 +1187,9 @@
            inkscape:label="logging-framework.link"
            onmouseover="style.opacity = 0.6;"
            onmouseout="style.opacity = 1.0;"
-           xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html#shared-services"
-           xlink:title="To be done"
-           transform="translate(1.9467032e-6,25.000008)"
+           xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+           xlink:title="Logging Framework: To be done"
+           transform="translate(-1.5909867e-5,42.000006)"
            style="display:inline">
           <g
              id="g1912-5-8"
@@ -1242,9 +1212,9 @@
                inkscape:label="loggingframework.label"><tspan
                  x="269"
                  y="111.74272"
-                 id="tspan74"><tspan
+                 id="tspan58"><tspan
                    dx="0 0 0 0 0 0 0 0.26458254 -0.26458272 0 0 0 0 0 0 0 0 0.26458386 -0.26458272"
-                   id="tspan73">Logging Framework (PoC)</tspan></tspan></text>
+                   id="tspan57">Logging Framework (PoC)</tspan></tspan></text>
           </g>
         </a>
       </g>
@@ -1277,19 +1247,19 @@
              inkscape:label="ccsdk.label"><tspan
                x="227"
                y="123.42522"
-               id="tspan76"><tspan
+               id="tspan60"><tspan
                  dx="0 0 0 0 0 0 0.26458278"
-                 id="tspan75">Common
+                 id="tspan59">Common
 </tspan></tspan><tspan
                x="227"
                y="126.75897"
-               id="tspan78"><tspan
+               id="tspan62"><tspan
                  dx="0 0 0 0 0 0 0 0 0 0 0.26458338 -0.26458368 0 0 0.26458278"
-                 id="tspan77">Controller SDK
+                 id="tspan61">Controller SDK
 </tspan></tspan><tspan
                x="227"
                y="130.09272"
-               id="tspan79">(CCSDK)</tspan></text>
+               id="tspan63">(CCSDK)</tspan></text>
         </g>
       </a>
       <a
@@ -1323,19 +1293,19 @@
              inkscape:label="sdnc.label"><tspan
                x="183.24023"
                y="123.66546"
-               id="tspan81"><tspan
+               id="tspan65"><tspan
                  dx="0 0 0 0.26458326"
-                 id="tspan80">SDN
+                 id="tspan64">SDN
 </tspan></tspan><tspan
                x="183.24023"
                y="126.99921"
-               id="tspan83"><tspan
+               id="tspan67"><tspan
                  dx="0 0 0 0 0 0 0 0 0 0 0.26458338"
-                 id="tspan82">Controller
+                 id="tspan66">Controller
 </tspan></tspan><tspan
                x="183.24023"
                y="130.33295"
-               id="tspan84">(SDNC)</tspan></text>
+               id="tspan68">(SDNC)</tspan></text>
         </g>
       </a>
       <a
@@ -1366,19 +1336,19 @@
              inkscape:label="cds.label"><tspan
                x="158"
                y="123.42522"
-               id="tspan86"><tspan
+               id="tspan70"><tspan
                  dx="0 0 0 0 0 0 0 0 0 0 0.26458338"
-                 id="tspan85">Controller
+                 id="tspan69">Controller
 </tspan></tspan><tspan
                x="158"
                y="126.75897"
-               id="tspan88"><tspan
+               id="tspan72"><tspan
                  dx="0 0 0 0 0 0 0.26458278 -0.26458272 0 0 0 0 0 0.26458278"
-                 id="tspan87">Design Studio
+                 id="tspan71">Design Studio
 </tspan></tspan><tspan
                x="158"
                y="130.09272"
-               id="tspan89">(CDS)</tspan></text>
+               id="tspan73">(CDS)</tspan></text>
         </g>
       </a>
       <a
@@ -1409,23 +1379,23 @@
              inkscape:label="infrastructureadaption.label"><tspan
                x="120"
                y="123.42522"
-               id="tspan91"><tspan
+               id="tspan75"><tspan
                  dx="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2645835"
                  style="-inkscape-font-specification:sans-serif"
-                 id="tspan90">Infrastructure 
+                 id="tspan74">Infrastructure 
 </tspan></tspan><tspan
                x="120"
                y="126.75897"
-               id="tspan93"><tspan
+               id="tspan77"><tspan
                  dx="0 0 0 0 0 0 0 0 0.26458278"
                  style="-inkscape-font-specification:sans-serif"
-                 id="tspan92">Adaption
+                 id="tspan76">Adaption
 </tspan></tspan><tspan
                x="120"
                y="130.09272"
-               id="tspan95"><tspan
+               id="tspan79"><tspan
                  style="-inkscape-font-specification:sans-serif"
-                 id="tspan94">(Multi-VIM/Cloud)</tspan></tspan></text>
+                 id="tspan78">(Multi-VIM/Cloud)</tspan></tspan></text>
         </g>
       </a>
       <g
@@ -1459,20 +1429,20 @@
                inkscape:label="dcae.label"><tspan
                  x="81"
                  y="123.42522"
-                 id="tspan97"><tspan
+                 id="tspan81"><tspan
                    dx="0 0 0 0 0.26458302 -0.2645832 0 0 0 0 0 0 0 0 0 0 0.26458386"
-                   id="tspan96">Data Collection, 
+                   id="tspan80">Data Collection, 
 </tspan></tspan><tspan
                  x="81"
                  y="126.75897"
-                 id="tspan100"><tspan
+                 id="tspan84"><tspan
                    dx="0 0 0 0 0 0 0 0 0 0.26458338 -0.26458368 0.26458421"
-                   id="tspan98">Analytics &amp; </tspan><tspan
+                   id="tspan82">Analytics &amp; </tspan><tspan
                    dx="-0.26458463 0 0 0 0 0 0.26458433"
-                   id="tspan99">Events </tspan></tspan><tspan
+                   id="tspan83">Events </tspan></tspan><tspan
                  x="81"
                  y="130.09272"
-                 id="tspan101">(DCAE)</tspan></text>
+                 id="tspan85">(DCAE)</tspan></text>
           </g>
         </a>
         <a
@@ -1503,7 +1473,7 @@
                inkscape:label="analytics.label"><tspan
                  x="83"
                  y="136.49163"
-                 id="tspan102">Analytics</tspan></text>
+                 id="tspan86">Analytics</tspan></text>
           </g>
         </a>
         <a
@@ -1534,7 +1504,7 @@
                inkscape:label="collectors.label"><tspan
                  x="83"
                  y="136.49163"
-                 id="tspan103">Collectors</tspan></text>
+                 id="tspan87">Collectors</tspan></text>
           </g>
         </a>
       </g>
@@ -1543,8 +1513,8 @@
          inkscape:label="strimzikafka.link"
          onmouseover="style.opacity = 0.6;"
          onmouseout="style.opacity = 1.0;"
-         xlink:href="https://docs.onap.org/en/latest/platform/components/index.html"
-         xlink:title="To be done: Strimzi / Kafka">
+         xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+         xlink:title="Strimzi / Kafka: To be done">
         <g
            id="g7029"
            inkscape:label="strimzikafka"
@@ -1566,9 +1536,9 @@
              inkscape:label="strimzikafka.label"><tspan
                x="81.025391"
                y="107.49163"
-               id="tspan105"><tspan
+               id="tspan89"><tspan
                  dx="0 0 0 0 0 0 0 0.26458314 -0.26458272 0.26458254 -0.26458272"
-                 id="tspan104">Strimzi / Kafka</tspan></tspan></text>
+                 id="tspan88">Strimzi / Kafka</tspan></tspan></text>
         </g>
       </a>
       <a
@@ -1602,14 +1572,14 @@
            inkscape:label="aai.label"><tspan
              x="216.00391"
              y="91.491631"
-             id="tspan107"><tspan
+             id="tspan91"><tspan
                dx="0 0 0 0 0 0 0.2645835 -0.26458368 0.26458326 -0.26458272 0 0 0 0 0 0 0 0 0.2645835"
-               id="tspan106">Active &amp; Available </tspan></tspan><tspan
+               id="tspan90">Active &amp; Available </tspan></tspan><tspan
              x="216.00391"
              y="94.825379"
-             id="tspan109"><tspan
+             id="tspan93"><tspan
                dx="0 0 0 0 0 0 0 0 0 0.26458338 -0.26458272"
-               id="tspan108">Inventory (AAI)</tspan></tspan></text>
+               id="tspan92">Inventory (AAI)</tspan></tspan></text>
       </g>
       <a
          id="a4515"
@@ -1639,14 +1609,14 @@
              inkscape:label="cps.label"><tspan
                x="216.00391"
                y="91.491631"
-               id="tspan111"><tspan
+               id="tspan95"><tspan
                  dx="0 0 0 0 0.092604198 -0.092604123 0 0 0 0 0 0 0 0.26458278 -0.26458272 0 0 0 0 0 0 0 0 0 0 0.26458541"
-                 id="tspan110">Configuration Persistence </tspan></tspan><tspan
+                 id="tspan94">Configuration Persistence </tspan></tspan><tspan
                x="216.00391"
                y="94.825379"
-               id="tspan113"><tspan
+               id="tspan97"><tspan
                  dx="0 0 0 0 0 0 0 0.26458254 -0.26458272"
-                 id="tspan112">Service (CPS)</tspan></tspan></text>
+                 id="tspan96">Service (CPS)</tspan></tspan></text>
         </g>
       </a>
       <a
@@ -1678,13 +1648,13 @@
              inkscape:label="so.label"><tspan
                x="171.00391"
                y="91.809131"
-               id="tspan115"><tspan
+               id="tspan99"><tspan
                  dx="0 0 0 0 0 0 0 0.26458254 -0.26458272 0 0 0 0 0 0 0 0 0 0 0 0 0.26458278"
-                 id="tspan114">Service Orchestration
+                 id="tspan98">Service Orchestration
 </tspan></tspan><tspan
                x="171.00391"
                y="95.777881"
-               id="tspan116">(SO)</tspan></text>
+               id="tspan100">(SO)</tspan></text>
         </g>
       </a>
       <g
@@ -1705,7 +1675,7 @@
                style="fill:#009893;fill-opacity:1;stroke:#009893;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
                id="rect13557-2"
                width="41"
-               height="11.999998"
+               height="12.06724"
                x="81"
                y="88.932762"
                inkscape:label="policyframework.form" />
@@ -1718,11 +1688,11 @@
                inkscape:label="policyframework.label"><tspan
                  x="81"
                  y="91.742725"
-                 id="tspan119"><tspan
+                 id="tspan103"><tspan
                    dx="0 0 0 0 0 0 0.2645829"
-                   id="tspan117">Policy </tspan><tspan
+                   id="tspan101">Policy </tspan><tspan
                    dx="-0.26458272"
-                   id="tspan118">Framework</tspan></tspan></text>
+                   id="tspan102">Framework</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1752,7 +1722,7 @@
                inkscape:label="clamp.label"><tspan
                  x="83.003906"
                  y="97.491631"
-                 id="tspan120">CLAMP</tspan></text>
+                 id="tspan104">CLAMP</tspan></text>
           </g>
         </a>
       </g>
@@ -1760,7 +1730,7 @@
          id="g5379"
          inkscape:label="interfaces"
          style="display:inline"
-         transform="translate(0,0.06723675)">
+         transform="translate(-8.9952373,0.06724082)">
         <a
            id="a4558"
            inkscape:label="interfaces.link"
@@ -1770,9 +1740,11 @@
            xlink:title="Various ONAP components provide also a user interface.">
           <g
              id="g5413"
-             inkscape:label="interfaces">
+             inkscape:label="interfaces"
+             transform="matrix(1.0456852,0,0,1,-2.6954277,0)"
+             style="stroke-width:0.977911">
             <rect
-               style="font-variation-settings:normal;display:inline;opacity:0.4;fill:#009893;fill-opacity:1;stroke:#009893;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
+               style="font-variation-settings:normal;display:inline;opacity:0.4;fill:#009893;fill-opacity:1;stroke:#009893;stroke-width:3.91165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
                id="rect13557-1-3"
                width="197"
                height="10.000002"
@@ -1781,16 +1753,16 @@
                inkscape:label="interfaces.form" />
             <text
                xml:space="preserve"
-               style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect13557-1-3);display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+               style="font-style:normal;font-weight:normal;font-size:3.175px;line-height:1.25;font-family:sans-serif;letter-spacing:-0.0926042px;word-spacing:-0.264583px;white-space:pre;shape-inside:url(#rect13557-1-3);display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.258739"
                x="-47.995235"
                y="75"
                id="text1842"
                inkscape:label="interfaces.label"><tspan
                  x="59"
                  y="74.742725"
-                 id="tspan122"><tspan
+                 id="tspan106"><tspan
                    style="font-weight:bold;-inkscape-font-specification:'sans-serif Bold';fill:#ffffff"
-                   id="tspan121">Interfaces</tspan></tspan></text>
+                   id="tspan105">Interfaces</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1821,9 +1793,9 @@
                inkscape:label="usecaseui.label"><tspan
                  x="130.00391"
                  y="79.742725"
-                 id="tspan124"><tspan
+                 id="tspan108"><tspan
                    dx="0 0 0 0 0 0 0 0 0.2645835 -0.26458368 0 0.26458314 -0.26458272"
-                   id="tspan123">Use-Case UI (UUI)</tspan></tspan></text>
+                   id="tspan107">Use-Case UI (UUI)</tspan></tspan></text>
           </g>
         </a>
         <a
@@ -1853,7 +1825,7 @@
                inkscape:label="portal-ng.label"><tspan
                  x="60"
                  y="79.742725"
-                 id="tspan125">Portal-NG</tspan></text>
+                 id="tspan109">Portal-NG</tspan></text>
           </g>
         </a>
       </g>
@@ -2006,22 +1978,41 @@
         </g>
       </g>
     </a>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="12.126981"
-       y="167.08885"
-       id="text4"><tspan
-         sodipodi:role="line"
-         id="tspan4"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.35px;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#999999;stroke-width:0.264583"
-         x="12.126981"
-         y="167.08885">Infrastructure</tspan><tspan
-         sodipodi:role="line"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.35px;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#999999;stroke-width:0.264583"
-         x="12.126981"
-         y="175.02635"
-         id="tspan5">Service</tspan></text>
+    <a
+       id="a1"
+       xlink:title="Infrastructure Service: To be done"
+       xlink:href="https://docs.onap.org/en/latest/platform/architecture/index.html"
+       onmouseover="style.opacity = 0.6;"
+       onmouseout="style.opacity = 1.0;"
+       inkscape:label="infrastructureservice">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;white-space:pre;shape-inside:url(#rect1);display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="-109.66076"
+         y="137.99998"
+         id="text1"
+         transform="translate(4.9959484,2.3022609)"
+         inkscape:label="infrastructureservice.label"><tspan
+           x="7.0039062"
+           y="164.61826"
+           id="tspan111"><tspan
+             style="font-weight:bold;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#999999"
+             id="tspan110">Infrastructure
+</tspan></tspan><tspan
+           x="7.0039062"
+           y="172.55576"
+           id="tspan113"><tspan
+             style="font-weight:bold;font-family:Sans;-inkscape-font-specification:'Sans Bold';fill:#999999"
+             id="tspan112">Service</tspan></tspan></text>
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#8c8c8c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;paint-order:normal"
+         id="rect1"
+         width="318"
+         height="20.000006"
+         x="7.004765"
+         y="159"
+         inkscape:label="infrastructureservice.form" />
+    </a>
   </g>
   <style
      type="text/css"